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

ignore the actual length of share key. 2.0.40

Browse source
This commit is contained in:
winlin 2014-12-01 22:09:09 +08:00
parent d171a26758
commit 1847c5fef7
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 2 #define VERSION_MAJOR 2
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 39 #define VERSION_REVISION 40
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server" #define RTMP_SIG_SRS_ROLE "origin/edge server"

6
trunk/src/rtmp/srs_protocol_handshake.cpp
View file

@ -532,7 +532,11 @@ namespace _srs_internal
srs_error("calc s1 key failed. ret=%d", ret); srs_error("calc s1 key failed. ret=%d", ret);
return ret; return ret;
} }
srs_assert(pkey_size == 128);
// altough the public key is always 128bytes, but the share key maybe not.
// we just ignore the actual key size, but if need to use the key, must use the actual size.
// TODO: FIXME: use the actual key size.
//srs_assert(pkey_size == 128);
srs_verbose("calc s1 key success."); srs_verbose("calc s1 key success.");
char* s1_digest = NULL; char* s1_digest = NULL;