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:
zhengchao
2018-10-29 15:17:11 +08:00
parent 211031c9a3
commit fd0c9ce6c2
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/src/ssl_stream.cpp
View File

@@ -796,7 +796,8 @@ static SSL * upstream_ssl_create(struct ssl_mgr * mgr, const struct ssl_chello *
} }
if (chello->alpn) if (chello->alpn)
{ {
SSL_set_alpn_protos(ssl, chello->alpn, strlen(chello->alpn)); ret=SSL_set_alpn_protos(ssl, (unsigned char*)chello->alpn, strlen(chello->alpn));
assert(0);
} }
/* lower memory footprint for idle connections */ /* lower memory footprint for idle connections */
SSL_set_mode(ssl, SSL_get_mode(ssl) | SSL_MODE_RELEASE_BUFFERS); SSL_set_mode(ssl, SSL_get_mode(ssl) | SSL_MODE_RELEASE_BUFFERS);

4
platform/src/ssl_utils.cc
View File

@@ -1840,8 +1840,8 @@ static char* parse_alpn_extension(const unsigned char* buff, size_t buff_len, en
*result = CHELLO_PARSE_INVALID_FORMAT; *result = CHELLO_PARSE_INVALID_FORMAT;
return NULL; return NULL;
} }
char* alpn = (char*)malloc(len + 1); char* alpn = ALLOC(char, len + 1);
strncpy(alpn, (const char*)buff + 2, len); strncpy((char*)alpn, (const char*)buff + 2, len);
alpn[len] = '\0'; alpn[len] = '\0';
*result = CHELLO_PARSE_SUCCESS; *result = CHELLO_PARSE_SUCCESS;
return alpn; return alpn;

2
platform/test/test_chello_parse.cpp
View File

@@ -147,7 +147,7 @@ int main()
printf("cipher suites: %s\n", chello2->cipher_suites); printf("cipher suites: %s\n", chello2->cipher_suites);
printf("cipher suites for tls1.3: %s\n", chello2->cipher_suites_tls13); printf("cipher suites for tls1.3: %s\n", chello2->cipher_suites_tls13);
printf("sni: %s\n", chello2->sni); printf("sni: %s\n", chello2->sni);
char* alpn = parse_alpn(chello2->alpn); char* alpn = parse_alpn((char*)chello2->alpn);
printf("alpn: %s\n", alpn); printf("alpn: %s\n", alpn);
free(alpn); free(alpn);
alpn = NULL; alpn = NULL;