From 7adbe7f45638235b09ac833839169b30c0dcd816 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 8 Aug 2014 10:47:55 +0800 Subject: [PATCH] fix utest build failed, sync with src changed. --- trunk/src/core/srs_core.hpp | 2 +- trunk/src/rtmp/srs_protocol_handshake.hpp | 4 ++-- trunk/src/utest/srs_utest_protocol.cpp | 25 +++-------------------- 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index b817b8053..05404d394 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "193" +#define VERSION_REVISION "194" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "SRS" diff --git a/trunk/src/rtmp/srs_protocol_handshake.hpp b/trunk/src/rtmp/srs_protocol_handshake.hpp index 0584e28bf..b46b1038f 100644 --- a/trunk/src/rtmp/srs_protocol_handshake.hpp +++ b/trunk/src/rtmp/srs_protocol_handshake.hpp @@ -114,8 +114,8 @@ namespace _srs_internal #define __SRS_OpensslHashSize 512 extern u_int8_t SrsGenuineFMSKey[]; extern u_int8_t SrsGenuineFPKey[]; - int openssl_HMACsha256(const void* data, int data_size, const void* key, int key_size, void* digest); - int openssl_generate_key(char* _private_key, char* _public_key, int32_t size); + int openssl_HMACsha256(const void* key, int key_size, const void* data, int data_size, void* digest); + int openssl_generate_key(char* public_key, int32_t size); // calc the offset of key, // the key->offset cannot be used as the offset of key. diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 77e545d31..d1a737134 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -222,8 +222,8 @@ VOID TEST(ProtocolHandshakeTest, OpensslSha256) char digest[__SRS_OpensslHashSize]; ASSERT_EQ(ERROR_SUCCESS, openssl_HMACsha256( - random_bytes, sizeof(random_bytes), SrsGenuineFPKey, 30, + random_bytes, sizeof(random_bytes), digest ) ); @@ -238,30 +238,11 @@ VOID TEST(ProtocolHandshakeTest, OpensslSha256) // verify the dh key VOID TEST(ProtocolHandshakeTest, DHKey) { - char pri_key[] = { - (char)0x6e, (char)0x65, (char)0x69, (char)0x2d, (char)0x69, (char)0x2d, (char)0x69, (char)0x73, - (char)0x6e, (char)0x69, (char)0x73, (char)0x6c, (char)0x65, (char)0x72, (char)0x69, (char)0x72, - (char)0x76, (char)0x65, (char)0x72, (char)0x69, (char)0x77, (char)0x74, (char)0x2e, (char)0x6e, - (char)0x72, (char)0x76, (char)0x72, (char)0x65, (char)0x72, (char)0x70, (char)0x72, (char)0x69, - (char)0x69, (char)0x70, (char)0x72, (char)0x73, (char)0x6e, (char)0x65, (char)0x72, (char)0x72, - (char)0x6e, (char)0x2d, (char)0x65, (char)0x74, (char)0x72, (char)0x6c, (char)0x69, (char)0x74, - (char)0x69, (char)0x65, (char)0x40, (char)0x69, (char)0x69, (char)0x76, (char)0x77, (char)0x2d, - (char)0x73, (char)0x65, (char)0x72, (char)0x72, (char)0x76, (char)0x73, (char)0x72, (char)0x2e, - (char)0x2d, (char)0x76, (char)0x65, (char)0x31, (char)0x65, (char)0x6d, (char)0x6d, (char)0x73, - (char)0x69, (char)0x73, (char)0x74, (char)0x2e, (char)0x74, (char)0x72, (char)0x65, (char)0x65, - (char)0x72, (char)0x65, (char)0x2d, (char)0x74, (char)0x69, (char)0x31, (char)0x65, (char)0x2d, - (char)0x6f, (char)0x77, (char)0x2e, (char)0x76, (char)0x77, (char)0x2d, (char)0x77, (char)0x72, - (char)0x65, (char)0x65, (char)0x31, (char)0x74, (char)0x73, (char)0x70, (char)0x74, (char)0x6e, - (char)0x72, (char)0x6e, (char)0x73, (char)0x6d, (char)0x2e, (char)0x69, (char)0x72, (char)0x2d, - (char)0x65, (char)0x69, (char)0x77, (char)0x69, (char)0x76, (char)0x72, (char)0x77, (char)0x72, - (char)0x32, (char)0x6e, (char)0x65, (char)0x6c, (char)0x2e, (char)0x2d, (char)0x6e, (char)0x69 - }; - char pub_key1[128]; - openssl_generate_key(pri_key, pub_key1, 128); + openssl_generate_key(pub_key1, 128); char pub_key2[128]; - openssl_generate_key(pri_key, pub_key2, 128); + openssl_generate_key(pub_key2, 128); EXPECT_FALSE(srs_bytes_equals(pub_key1, pub_key2, 128)); }