From: rl1987 <rl1987@sdf.lonestar.org>
Date: Mon, 5 Oct 2015 18:56:27 +0000 (+0300)
Subject: Fix compilation failure when SSL_SESSION_get_master_key() is provided by OpenSSL.
X-Git-Tag: tor-0.2.8.1-alpha~325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b216340d75403571b8031baf5f63f751584470d1;p=thirdparty%2Ftor.git

Fix compilation failure when SSL_SESSION_get_master_key() is provided by OpenSSL.
---

diff --git a/src/common/tortls.h b/src/common/tortls.h
index 2f467a2f55..1cfe029adb 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,