diff --git a/.gitignore b/.gitignore index 011dd5fac..6216052aa 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,5 @@ .AppleDouble .idea +.DS_Store diff --git a/README.md b/README.md index 08707cc83..0da53818b 100755 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ For previous versions, please read: ## V2 changes +* v2.0, 2019-12-13, Support openssl versions greater than 1.1.0. 2.0.266 * v2.0, 2019-11-29, [2.0 release7(2.0.265)][r2.0r7] released. 86994 lines. * v2.0, 2019-11-29, For [srs-docker](https://github.com/ossrs/srs-docker/tree/master/2.0), install Cherrypy without sudo. 2.0.265 * v2.0, 2019-04-06, For [#1304][bug #1304], Default HSTRS to on. 2.0.264 diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp index 87b9ea67b..3d69fdb6e 100644 --- a/trunk/src/protocol/srs_rtmp_handshake.cpp +++ b/trunk/src/protocol/srs_rtmp_handshake.cpp @@ -137,7 +137,7 @@ namespace _srs_internal 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB, 0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE }; // 62 - + srs_error_t do_openssl_HMACsha256(HMAC_CTX* ctx, const void* data, int data_size, void* digest, unsigned int* digest_size) { srs_error_t err = srs_success; @@ -152,6 +152,7 @@ namespace _srs_internal return err; } + /** * sha256 digest algorithm. * @param key the sha256 key, NULL to use EVP_Digest, for instance, @@ -201,24 +202,24 @@ namespace _srs_internal return err; } -#define RFC2409_PRIME_1024 \ -"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \ -"29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \ -"EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" \ -"E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" \ -"EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" \ -"FFFFFFFFFFFFFFFF" - + #define RFC2409_PRIME_1024 \ + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \ + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \ + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" \ + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" \ + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" \ + "FFFFFFFFFFFFFFFF" + SrsDH::SrsDH() { pdh = NULL; } - + SrsDH::~SrsDH() { close(); } - + void SrsDH::close() { if (pdh != NULL) {