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:03:40 +08:00
parent 8e294709b0
commit 0bc7fdbb35
12 changed files with 4 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,8 +34,6 @@
#include <srs_kernel_buffer.hpp>
#include <srs_kernel_utility.hpp>
#ifdef SRS_AUTO_SSL
using namespace _srs_internal;
// for openssl_HMACsha256
@ -108,8 +106,6 @@ static int DH_set_length(DH *dh, long length)
return 1;
}
#endif
namespace _srs_internal
{
// 68bytes FMS key which is used to sign the sever packet.
@ -1175,13 +1171,6 @@ SrsComplexHandshake::~SrsComplexHandshake()
{
}
#ifndef SRS_AUTO_SSL
srs_error_t SrsComplexHandshake::handshake_with_client(SrsHandshakeBytes* /*hs_bytes*/, ISrsProtocolReaderWriter* /*io*/)
{
srs_trace("directly use simple handshake for ssl disabled.");
return srs_error_new(ERROR_RTMP_TRY_SIMPLE_HS, "try simple handshake");
}
#else
srs_error_t SrsComplexHandshake::handshake_with_client(SrsHandshakeBytes* hs_bytes, ISrsProtocolReaderWriter* io)
{
srs_error_t err = srs_success;
@ -1265,14 +1254,7 @@ srs_error_t SrsComplexHandshake::handshake_with_client(SrsHandshakeBytes* hs_byt
return err;
}
#endif
#ifndef SRS_AUTO_SSL
srs_error_t SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* /*hs_bytes*/, ISrsProtocolReaderWriter* /*io*/)
{
return srs_error_new(ERROR_RTMP_TRY_SIMPLE_HS, "try simple handshake");
}
#else
srs_error_t SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrsProtocolReaderWriter* io)
{
srs_error_t err = srs_success;
@ -1346,6 +1328,4 @@ srs_error_t SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_byt
return err;
}
#endif