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
2015-03-10 18:33:32 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
24616e15b5384bce0d003040f91bf95ba8308a4c
24616e15
1 parent
b3aed2cb
remove the code for xcode, not required.
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
1 行增加
和
10 行删除
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/winlin.xcuserdatad/UserInterfaceState.xcuserstate
trunk/src/protocol/srs_rtmp_handshake.cpp
trunk/ide/srs_xcode/srs_xcode.xcodeproj/project.xcworkspace/xcuserdata/winlin.xcuserdatad/UserInterfaceState.xcuserstate
查看文件 @
24616e1
不能预览此文件类型
trunk/src/protocol/srs_rtmp_handshake.cpp
查看文件 @
24616e1
...
...
@@ -73,7 +73,7 @@ namespace _srs_internal
int
__openssl_HMACsha256
(
HMAC_CTX
*
ctx
,
const
void
*
data
,
int
data_size
,
void
*
digest
,
unsigned
int
*
digest_size
)
{
int
ret
=
ERROR_SUCCESS
;
#ifndef SRS_OSX
if
(
HMAC_Update
(
ctx
,
(
unsigned
char
*
)
data
,
data_size
)
<
0
)
{
ret
=
ERROR_OpenSslSha256Update
;
return
ret
;
...
...
@@ -83,10 +83,6 @@ namespace _srs_internal
ret
=
ERROR_OpenSslSha256Final
;
return
ret
;
}
#else
HMAC_Update
(
ctx
,
(
unsigned
char
*
)
data
,
data_size
);
HMAC_Final
(
ctx
,
(
unsigned
char
*
)
digest
,
digest_size
);
#endif
return
ret
;
}
...
...
@@ -120,15 +116,10 @@ namespace _srs_internal
// @remark, if no key, use EVP_Digest to digest,
// for instance, in python, hashlib.sha256(data).digest().
HMAC_CTX_init
(
&
ctx
);
#ifndef SRS_OSX
if
(
HMAC_Init_ex
(
&
ctx
,
__key
,
key_size
,
EVP_sha256
(),
NULL
)
<
0
)
{
ret
=
ERROR_OpenSslSha256Init
;
return
ret
;
}
#else
HMAC_Init_ex
(
&
ctx
,
__key
,
key_size
,
EVP_sha256
(),
NULL
);
#endif
ret
=
__openssl_HMACsha256
(
&
ctx
,
data
,
data_size
,
__digest
,
&
digest_size
);
HMAC_CTX_cleanup
(
&
ctx
);
...
...
请
注册
或
登录
后发表评论