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

删除ssl strem中的无用变量。

Browse Source
This commit is contained in:
zhengchao
2018-11-06 09:48:42 +08:00
parent f1822e04c5
commit 8bfecea928
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/src/ssl_stream.cpp
View File

@@ -42,7 +42,6 @@
#include <platform.h> #include <platform.h>
int SSL_EX_DATA_IDX_SSLMGR; int SSL_EX_DATA_IDX_SSLMGR;
int SSL_EX_DATA_IDX_VERIFIED;
int SSL_PEER_CERT_VERIFY_PASSED=1; int SSL_PEER_CERT_VERIFY_PASSED=1;
int SSL_PEER_CERT_VERIFY_FAILED=0; int SSL_PEER_CERT_VERIFY_FAILED=0;
@@ -460,7 +459,7 @@ static void log_ssl_master_key(SSL* ssl, int fd, tfe_conn_dir dir, FILE* fp)
struct tfe_stream_addr* addr=tfe_stream_addr_create_by_fd(fd, dir); struct tfe_stream_addr* addr=tfe_stream_addr_create_by_fd(fd, dir);
char* addr_string=tfe_stream_addr_to_str(addr); char* addr_string=tfe_stream_addr_to_str(addr);
fprintf(fp, "#%s %s %s\n%s\r", time_str, tfe_stream_conn_dir_to_str(dir), addr_string, key_str); fprintf(fp, "#%s %s %s\n%s\n", time_str, tfe_stream_conn_dir_to_str(dir), addr_string, key_str);
free(key_str); free(key_str);
tfe_stream_addr_free(addr); tfe_stream_addr_free(addr);
@@ -532,7 +531,6 @@ struct ssl_mgr * ssl_manager_init(const char * ini_profile, const char * section
//tfe2a uses SSLv23_method, it was been deprecated and replaced with the TLS_method() in openssl 1.1.0. //tfe2a uses SSLv23_method, it was been deprecated and replaced with the TLS_method() in openssl 1.1.0.
mgr->sslmethod = TLS_method; mgr->sslmethod = TLS_method;
SSL_EX_DATA_IDX_SSLMGR = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, NULL); SSL_EX_DATA_IDX_SSLMGR = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, NULL);
SSL_EX_DATA_IDX_VERIFIED = SSL_CTX_get_ex_new_index(0, NULL, NULL, NULL, NULL);
MESA_load_profile_uint_def(ini_profile, section, "ssl_compression", &(mgr->sslcomp), 1); MESA_load_profile_uint_def(ini_profile, section, "ssl_compression", &(mgr->sslcomp), 1);
MESA_load_profile_uint_def(ini_profile, section, "no_ssl2", &(mgr->no_ssl2), 1); MESA_load_profile_uint_def(ini_profile, section, "no_ssl2", &(mgr->no_ssl2), 1);