nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the address argument from client cipher classification fns

Browse Source
This commit is contained in:
Nick Mathewson 2012-11-28 12:35:02 -05:00
parent 047d9e57b0
commit 63208aa1e5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/tortls.c
View File

@ -1415,7 +1415,7 @@ prune_v2_cipher_list(void)
* CIPHERS_UNRESTRICTED. * CIPHERS_UNRESTRICTED.
**/ **/
static int static int
tor_tls_classify_client_ciphers(const SSL *ssl, const char *address) tor_tls_classify_client_ciphers(const SSL *ssl)
{ {
int i, res; int i, res;
SSL_SESSION *session; SSL_SESSION *session;
@ -1487,7 +1487,7 @@ tor_tls_classify_client_ciphers(const SSL *ssl, const char *address)
} }
s = smartlist_join_strings(elts, ":", 0, NULL); s = smartlist_join_strings(elts, ":", 0, NULL);
log_debug(LD_NET, "Got a %s V2/V3 cipher list from %s. It is: '%s'", log_debug(LD_NET, "Got a %s V2/V3 cipher list from %s. It is: '%s'",
(res == CIPHERS_V2) ? "fictitious" : "real", address, s); (res == CIPHERS_V2) ? "fictitious" : "real", ADDR(tor_tls), s);
tor_free(s); tor_free(s);
smartlist_free(elts); smartlist_free(elts);
} }
@ -1502,9 +1502,9 @@ tor_tls_classify_client_ciphers(const SSL *ssl, const char *address)
* a list that indicates that the client knows how to do the v2 TLS connection * a list that indicates that the client knows how to do the v2 TLS connection
* handshake. */ * handshake. */
static int static int
tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address) tor_tls_client_is_using_v2_ciphers(const SSL *ssl)
{ {
return tor_tls_classify_client_ciphers(ssl, address) >= CIPHERS_V2; return tor_tls_classify_client_ciphers(ssl) >= CIPHERS_V2;
} }
/** Invoked when a TLS state changes: log the change at severity 'debug' */ /** Invoked when a TLS state changes: log the change at severity 'debug' */
@ -1548,7 +1548,7 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val)
} }
/* Now check the cipher list. */ /* Now check the cipher list. */
if (tor_tls_client_is_using_v2_ciphers(ssl, ADDR(tls))) { if (tor_tls_client_is_using_v2_ciphers(ssl)) {
if (tls->wasV2Handshake) if (tls->wasV2Handshake)
return; /* We already turned this stuff off for the first handshake; return; /* We already turned this stuff off for the first handshake;
* This is a renegotiation. */ * This is a renegotiation. */
@ -2014,7 +2014,7 @@ tor_tls_finish_handshake(tor_tls_t *tls)
/* There doesn't seem to be a clear OpenSSL API to clear mode flags. */ /* There doesn't seem to be a clear OpenSSL API to clear mode flags. */
tls->ssl->mode &= ~SSL_MODE_NO_AUTO_CHAIN; tls->ssl->mode &= ~SSL_MODE_NO_AUTO_CHAIN;
#ifdef V2_HANDSHAKE_SERVER #ifdef V2_HANDSHAKE_SERVER
if (tor_tls_client_is_using_v2_ciphers(tls->ssl, ADDR(tls))) { if (tor_tls_client_is_using_v2_ciphers(tls->ssl)) {
/* This check is redundant, but back when we did it in the callback, /* This check is redundant, but back when we did it in the callback,
* we might have not been able to look up the tor_tls_t if the code * we might have not been able to look up the tor_tls_t if the code
* was buggy. Fixing that. */ * was buggy. Fixing that. */