external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge 2.0release

Browse source
This commit is contained in:
winlin 2019-12-13 10:47:04 +08:00
commit 1c391c85ae
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -31,4 +31,5 @@
.AppleDouble .AppleDouble
.idea .idea
.DS_Store

1
README.md
View file

@ -230,6 +230,7 @@ For previous versions, please read:
## V2 changes ## V2 changes
* v2.0, 2019-12-13, Support openssl versions greater than 1.1.0. 2.0.266
* <strong>v2.0, 2019-11-29, [2.0 release7(2.0.265)][r2.0r7] released. 86994 lines.</strong> * <strong>v2.0, 2019-11-29, [2.0 release7(2.0.265)][r2.0r7] released. 86994 lines.</strong>
* 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-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 * v2.0, 2019-04-06, For [#1304][bug #1304], Default HSTRS to on. 2.0.264

23
trunk/src/protocol/srs_rtmp_handshake.cpp
View file

@ -137,7 +137,7 @@ namespace _srs_internal
0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB, 0x6E, 0xEC, 0x5D, 0x2D, 0x29, 0x80, 0x6F, 0xAB,
0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE 0x93, 0xB8, 0xE6, 0x36, 0xCF, 0xEB, 0x31, 0xAE
}; // 62 }; // 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 do_openssl_HMACsha256(HMAC_CTX* ctx, const void* data, int data_size, void* digest, unsigned int* digest_size)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -152,6 +152,7 @@ namespace _srs_internal
return err; return err;
} }
/** /**
* sha256 digest algorithm. * sha256 digest algorithm.
* @param key the sha256 key, NULL to use EVP_Digest, for instance, * @param key the sha256 key, NULL to use EVP_Digest, for instance,
@ -201,24 +202,24 @@ namespace _srs_internal
return err; return err;
} }
#define RFC2409_PRIME_1024 \ #define RFC2409_PRIME_1024 \
"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \ "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \
"29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \ "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \
"EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" \ "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" \
"E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" \ "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" \
"EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" \ "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" \
"FFFFFFFFFFFFFFFF" "FFFFFFFFFFFFFFFF"
SrsDH::SrsDH() SrsDH::SrsDH()
{ {
pdh = NULL; pdh = NULL;
} }
SrsDH::~SrsDH() SrsDH::~SrsDH()
{ {
close(); close();
} }
void SrsDH::close() void SrsDH::close()
{ {
if (pdh != NULL) { if (pdh != NULL) {