diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-03 14:46:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-03 14:46:33 -0500 |
| commit | a5f7a8b047e3e0e58604b054ef98b998be537523 (patch) | |
| tree | f95d744e4ee2b233ecaf8e49564a69c8373e80a6 /src/common/tortls.h | |
| parent | 957cdb54699937818b539c75e413e88760ee34cd (diff) | |
| parent | fa52b6f075a8bb90a3f3a014ef7423940f8a20b7 (diff) | |
| download | tor-a5f7a8b047e3e0e58604b054ef98b998be537523.tar.gz tor-a5f7a8b047e3e0e58604b054ef98b998be537523.zip | |
Merge branch 'openssl_compat'
Diffstat (limited to 'src/common/tortls.h')
| -rw-r--r-- | src/common/tortls.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/tortls.h b/src/common/tortls.h index 6a4ef9aebe..7239eb9fd7 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -143,9 +143,10 @@ STATIC size_t SSL_SESSION_get_master_key(SSL_SESSION *s, uint8_t *out, 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, - int *secret_len, - STACK_OF(SSL_CIPHER) *peer_ciphers, - SSL_CIPHER **cipher, void *arg); + int *secret_len, + STACK_OF(SSL_CIPHER) *peer_ciphers, + CONST_IF_OPENSSL_1_1_API SSL_CIPHER **cipher, + void *arg); STATIC int find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher); MOCK_DECL(STATIC X509*, tor_tls_create_certificate,(crypto_pk_t *rsa, |