]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Fix compilation failure when SSL_SESSION_get_master_key() is provided by OpenSSL.
authorrl1987 <rl1987@sdf.lonestar.org>
Mon, 5 Oct 2015 18:56:27 +0000 (21:56 +0300)
committerrl1987 <rl1987@sdf.lonestar.org>
Mon, 5 Oct 2015 18:56:27 +0000 (21:56 +0300)
src/common/tortls.h

index 2f467a2f557756d59836cae285829c9be76ebe8e..1cfe029adb9ea6f7778286d22e506d7b61f32b9d 100644 (file)
@@ -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,