Commit e6d63476 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug26005_034'

parents 01d729cb 89cafc4a

src/common/aes.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ aes_cipher_free_(aes_cnt_cipher_t *cipher_) 
  if (!cipher_)

    return;

  EVP_CIPHER_CTX *cipher = (EVP_CIPHER_CTX *) cipher_;

#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)

#ifdef OPENSSL_1_1_API

  EVP_CIPHER_CTX_reset(cipher);

#else

  EVP_CIPHER_CTX_cleanup(cipher);

src/common/crypto.c

+5 −5
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ crypto_early_init(void) 


    crypto_early_initialized_ = 1;



#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)

#ifdef OPENSSL_1_1_API

    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |

                     OPENSSL_INIT_LOAD_CRYPTO_STRINGS |

                     OPENSSL_INIT_ADD_ALL_CIPHERS |
@@ -1062,13 +1062,13 @@ crypto_dh_free_(crypto_dh_t *dh) 
int

crypto_global_cleanup(void)

{

#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0)

#ifndef OPENSSL_1_1_API

  EVP_cleanup();

#endif

#ifndef NEW_THREAD_API

  ERR_remove_thread_state(NULL);

#endif

#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0)

#ifndef OPENSSL_1_1_API

  ERR_free_strings();

#endif
@@ -1082,13 +1082,13 @@ crypto_global_cleanup(void) 
  dh_param_p = dh_param_p_tls = dh_param_g = NULL;



#ifndef DISABLE_ENGINES

#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0)

#ifndef OPENSSL_1_1_API

  ENGINE_cleanup();

#endif

#endif



  CONF_modules_unload(1);

#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,1,0)

#ifndef OPENSSL_1_1_API

  CRYPTO_cleanup_all_ex_data();

#endif

src/common/tortls.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ ENABLE_GCC_WARNING(redundant-decls) 
#include "container.h"

#include <string.h>



#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)

#ifdef OPENSSL_1_1_API

#define X509_get_notBefore_const(cert) \

    X509_get0_notBefore(cert)

#define X509_get_notAfter_const(cert) \
@@ -372,7 +372,7 @@ tor_tls_init(void) 
  check_no_tls_errors();



  if (!tls_library_is_initialized) {

#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)

#ifdef OPENSSL_1_1_API

    OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);

#else

    SSL_library_init();

src/test/test_tortls.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ test_tortls_tor_tls_get_error(void *data) 
static void

library_init(void)

{

#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)

#ifdef OPENSSL_1_1_API

  OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL);

#else

  SSL_library_init();