Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-12-01 22:09:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
1847c5fef7dac200a5e3d5aea38950f3382e2625
1847c5fe
1 parent
d171a267
ignore the actual length of share key. 2.0.40
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
6 行增加
和
2 行删除
trunk/src/core/srs_core.hpp
trunk/src/rtmp/srs_protocol_handshake.cpp
trunk/src/core/srs_core.hpp
查看文件 @
1847c5f
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION
39
#define VERSION_REVISION
40
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
trunk/src/rtmp/srs_protocol_handshake.cpp
查看文件 @
1847c5f
...
...
@@ -532,7 +532,11 @@ namespace _srs_internal
srs_error
(
"calc s1 key failed. ret=%d"
,
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."
);
char
*
s1_digest
=
NULL
;
...
...
请
注册
或
登录
后发表评论