winlin

ignore the actual length of share key. 2.0.40

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 39 34 +#define VERSION_REVISION 40
35 // server info. 35 // server info.
36 #define RTMP_SIG_SRS_KEY "SRS" 36 #define RTMP_SIG_SRS_KEY "SRS"
37 #define RTMP_SIG_SRS_ROLE "origin/edge server" 37 #define RTMP_SIG_SRS_ROLE "origin/edge server"
@@ -532,7 +532,11 @@ namespace _srs_internal @@ -532,7 +532,11 @@ namespace _srs_internal
532 srs_error("calc s1 key failed. ret=%d", ret); 532 srs_error("calc s1 key failed. ret=%d", ret);
533 return ret; 533 return ret;
534 } 534 }
535 - srs_assert(pkey_size == 128); 535 +
  536 + // altough the public key is always 128bytes, but the share key maybe not.
  537 + // we just ignore the actual key size, but if need to use the key, must use the actual size.
  538 + // TODO: FIXME: use the actual key size.
  539 + //srs_assert(pkey_size == 128);
536 srs_verbose("calc s1 key success."); 540 srs_verbose("calc s1 key success.");
537 541
538 char* s1_digest = NULL; 542 char* s1_digest = NULL;