commit b216340d75403571b8031baf5f63f751584470d1 Author: rl1987 rl1987@sdf.lonestar.org Date: Mon Oct 5 21:56:27 2015 +0300

Fix compilation failure when SSL_SESSION_get_master_key() is provided by OpenSSL. --- src/common/tortls.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/src/common/tortls.h b/src/common/tortls.h index 2f467a2..1cfe029 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -136,8 +136,10 @@ STATIC int tor_tls_client_is_using_v2_ciphers(const SSL *ssl); MOCK_DECL(STATIC void, try_to_extract_certs_from_tls, (int severity, tor_tls_t *tls, X509 **cert_out, X509 **id_cert_out)); STATIC int dn_indicates_v3_cert(X509_NAME *name); +#ifndef HAVE_SSL_SESSION_GET_MASTER_KEY STATIC size_t SSL_SESSION_get_master_key(SSL_SESSION *s, uint8_t *out, size_t len); +#endif STATIC void tor_tls_debug_state_callback(const SSL *ssl, int type, int val); STATIC void tor_tls_server_info_callback(const SSL *ssl, int type, int val); STATIC int tor_tls_session_secret_cb(SSL *ssl, void *secret,