gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改日志

Browse Source
This commit is contained in:
luwenpeng
2019-08-28 19:17:00 +08:00
parent dc726801f0
commit 3faede0663
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/src/ssl_stream.cpp
View File

@@ -893,7 +893,7 @@ static int upstream_ossl_init(struct ssl_stream* s_stream)
sslctx = SSL_CTX_new(mgr->sslmethod()); sslctx = SSL_CTX_new(mgr->sslmethod());
if (sslctx == NULL) if (sslctx == NULL)
{ {
TFE_LOG_ERROR(mgr->logger, "ssl stream, SSL_CTX_new() failed."); TFE_LOG_ERROR(mgr->logger, "ssl ctx new failed.");
return -1; return -1;
} }
sslctx_set_opts(sslctx, mgr); sslctx_set_opts(sslctx, mgr);
@@ -910,7 +910,7 @@ static int upstream_ossl_init(struct ssl_stream* s_stream)
ret=SSL_CTX_set_cipher_list(sslctx, common_cipher); ret=SSL_CTX_set_cipher_list(sslctx, common_cipher);
if(ret==0) if(ret==0)
{ {
TFE_LOG_ERROR(mgr->logger, "ssl stream, SSL_CTX_set_cipher_list %s failed.", common_cipher); TFE_LOG_ERROR(mgr->logger, "ssl ctx set cipher list %s failed.", common_cipher);
SSL_CTX_set_cipher_list(sslctx, mgr->default_ciphers); SSL_CTX_set_cipher_list(sslctx, mgr->default_ciphers);
} }
} }
@@ -926,13 +926,13 @@ static int upstream_ossl_init(struct ssl_stream* s_stream)
if (SSL_CTX_set_min_proto_version(sslctx, s_stream->ssl_min_version) == 0) if (SSL_CTX_set_min_proto_version(sslctx, s_stream->ssl_min_version) == 0)
{ {
SSL_CTX_free(sslctx); SSL_CTX_free(sslctx);
TFE_LOG_ERROR(mgr->logger, "ssl stream, SSL_CTX_set_min_proto_version() failed, ssl min version:%d.", s_stream->ssl_min_version); TFE_LOG_ERROR(mgr->logger, "ssl set min proto version failed %d.", s_stream->ssl_min_version);
return -1; return -1;
} }
if (SSL_CTX_set_max_proto_version(sslctx, s_stream->ssl_max_version) == 0) if (SSL_CTX_set_max_proto_version(sslctx, s_stream->ssl_max_version) == 0)
{ {
SSL_CTX_free(sslctx); SSL_CTX_free(sslctx);
TFE_LOG_ERROR(mgr->logger, "ssl stream, SSL_CTX_set_max_proto_version() failed, ssl max version:%d.", s_stream->ssl_max_version); TFE_LOG_ERROR(mgr->logger, "ssl set max proto version failed %d.", s_stream->ssl_max_version);
return -1; return -1;
} }
@@ -961,7 +961,7 @@ static int upstream_ossl_init(struct ssl_stream* s_stream)
SSL_CTX_free(sslctx); /* SSL_new() increments refcount */ SSL_CTX_free(sslctx); /* SSL_new() increments refcount */
if (!ssl) if (!ssl)
{ {
TFE_LOG_ERROR(mgr->logger, "ssl stream, SSL_new() failed."); TFE_LOG_ERROR(mgr->logger, "ssl new failed.");
return -1; return -1;
} }
SSL_set_ex_data(ssl, SSL_EX_DATA_IDX_SSLSTREAM, s_stream); SSL_set_ex_data(ssl, SSL_EX_DATA_IDX_SSLSTREAM, s_stream);
@@ -2254,5 +2254,4 @@ int ssl_stream_get_string_opt(struct ssl_stream *upstream, enum SSL_STREAM_OPT o
return -1; return -1;
} }
return 0; return 0;
} }