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

Always enable SRS_SSL

Browse source
This commit is contained in:
winlin 2018-12-22 20:23:39 +08:00
parent e4e6dd2169
commit c6844527fb
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/configure vendored
View file

@ -128,7 +128,7 @@ END
LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a" LibSTRoot="${SRS_OBJS_DIR}/st"; LibSTfile="${LibSTRoot}/libst.a"
# openssl-1.1.0e, for the RTMP complex handshake. # openssl-1.1.0e, for the RTMP complex handshake.
LibSSLRoot="";LibSSLfile="" LibSSLRoot="";LibSSLfile=""
if [ $SRS_SSL = YES && $SRS_USE_SYS_SSL = NO ]; then if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL == NO ]]; then
LibSSLRoot="${SRS_OBJS_DIR}/openssl/include"; LibSSLfile="${SRS_OBJS_DIR}/openssl/lib/libssl.a ${SRS_OBJS_DIR}/openssl/lib/libcrypto.a"; LibSSLRoot="${SRS_OBJS_DIR}/openssl/include"; LibSSLfile="${SRS_OBJS_DIR}/openssl/lib/libssl.a ${SRS_OBJS_DIR}/openssl/lib/libcrypto.a";
fi fi
# gperftools-2.1, for mem check and mem/cpu profile # gperftools-2.1, for mem check and mem/cpu profile
@ -141,7 +141,7 @@ if [ $SRS_GPERF_MD = YES ]; then
fi fi
# the link options, always use static link # the link options, always use static link
SrsLinkOptions="-ldl"; SrsLinkOptions="-ldl";
if [ $SRS_SSL = YES && $SRS_USE_SYS_SSL = YES ]; then if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL == YES ]]; then
SrsLinkOptions="${SrsLinkOptions} -lssl -lcrypto"; SrsLinkOptions="${SrsLinkOptions} -lssl -lcrypto";
fi fi
# if static specified, add static # if static specified, add static

4
trunk/src/app/srs_app_hls.cpp
View file

@ -647,10 +647,6 @@ srs_error_t SrsHlsMuxer::write_hls_key()
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
if (hls_keys) {
srs_warn("SSL is disabled, ignore HLS key");
}
if (hls_keys && current->sequence_no % hls_fragments_per_key == 0) { if (hls_keys && current->sequence_no % hls_fragments_per_key == 0) {
if (RAND_bytes(key, 16) < 0) { if (RAND_bytes(key, 16) < 0) {
return srs_error_wrap(err, "rand key failed."); return srs_error_wrap(err, "rand key failed.");

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

@ -106,6 +106,8 @@ static int DH_set_length(DH *dh, long length)
return 1; return 1;
} }
#endif
namespace _srs_internal namespace _srs_internal
{ {
// 68bytes FMS key which is used to sign the sever packet. // 68bytes FMS key which is used to sign the sever packet.
@ -1080,8 +1082,6 @@ namespace _srs_internal
} }
} }
#endif
SrsSimpleHandshake::SrsSimpleHandshake() SrsSimpleHandshake::SrsSimpleHandshake()
{ {
} }