backport r14165

svn:r14187
This commit is contained in:
Roger Dingledine 2008-03-26 01:45:35 +00:00
parent a6246d2a20
commit 55b2833528
1 changed files with 2 additions and 2 deletions

View File

@ -622,7 +622,7 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime)
#ifdef V2_HANDSHAKE_SERVER #ifdef V2_HANDSHAKE_SERVER
/** Return true iff the cipher list suggested by the client for <b>ssl</b> is /** Return true iff the cipher list suggested by the client for <b>ssl</b> is
* a list that indicates that the client know 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, const char *address)
@ -666,7 +666,7 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address)
} }
s = smartlist_join_strings(elts, ":", 0, NULL); s = smartlist_join_strings(elts, ":", 0, NULL);
log_info(LD_NET, "Got a non-version-1 cipher list from %s. It is: '%s'", log_info(LD_NET, "Got a non-version-1 cipher list from %s. It is: '%s'",
s, address); address, s);
tor_free(s); tor_free(s);
smartlist_free(elts); smartlist_free(elts);
} }