From 24616e15b5384bce0d003040f91bf95ba8308a4c Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 10 Mar 2015 18:33:32 +0800 Subject: [PATCH] remove the code for xcode, not required. --- .../UserInterfaceState.xcuserstate | Bin 26050 -> 27008 bytes trunk/src/protocol/srs_rtmp_handshake.cpp | 11 +---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/winlin.xcuserdatad/UserInterfaceState.xcuserstate b/trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/winlin.xcuserdatad/UserInterfaceState.xcuserstate index 3a13b13defcd257d9ece2c3f0fa951384d48156d..6c42ef045e00101b68efea101b9d7984929343ac 100644 GIT binary patch delta 15631 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 F{{XYlplbjC delta 15147 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 bWe>}q*qdn(+J6g5?7!Q8l3RbO?BD+b{J)2! diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp index 042a52b53..f379aadb5 100644 --- a/trunk/src/protocol/srs_rtmp_handshake.cpp +++ b/trunk/src/protocol/srs_rtmp_handshake.cpp @@ -73,7 +73,7 @@ namespace _srs_internal int __openssl_HMACsha256(HMAC_CTX* ctx, const void* data, int data_size, void* digest, unsigned int* digest_size) { int ret = ERROR_SUCCESS; -#ifndef SRS_OSX + if (HMAC_Update(ctx, (unsigned char *) data, data_size) < 0) { ret = ERROR_OpenSslSha256Update; return ret; @@ -83,10 +83,6 @@ namespace _srs_internal ret = ERROR_OpenSslSha256Final; return ret; } -#else - HMAC_Update(ctx, (unsigned char *) data, data_size); - HMAC_Final(ctx, (unsigned char *) digest, digest_size); -#endif return ret; } @@ -120,15 +116,10 @@ namespace _srs_internal // @remark, if no key, use EVP_Digest to digest, // for instance, in python, hashlib.sha256(data).digest(). HMAC_CTX_init(&ctx); - -#ifndef SRS_OSX if (HMAC_Init_ex(&ctx, __key, key_size, EVP_sha256(), NULL) < 0) { ret = ERROR_OpenSslSha256Init; return ret; } -#else - HMAC_Init_ex(&ctx, __key, key_size, EVP_sha256(), NULL); -#endif ret = __openssl_HMACsha256(&ctx, data, data_size, __digest, &digest_size); HMAC_CTX_cleanup(&ctx);