Changeset 14575


Ignore:
Timestamp:
Oct 13, 2015, 9:24:31 PM (6 years ago)
Author:
mikedld
Message:

#6005: Bump minimum OpenSSL version to 0.9.7, fix build for versions less than 0.9.8b

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r14555 r14575  
    113113set(CURL_MINIMUM            7.15.4)
    114114set(EVENT2_MINIMUM          2.0.10)
    115 set(OPENSSL_MINIMUM         0.9.4)
     115set(OPENSSL_MINIMUM         0.9.7)
    116116set(CYASSL_MINIMUM          3.0)
    117117set(POLARSSL_MINIMUM        1.2)
  • trunk/configure.ac

    r14534 r14575  
    4848
    4949# crypto backends
    50 OPENSSL_MINIMUM=0.9.4
     50OPENSSL_MINIMUM=0.9.7
    5151AC_SUBST(OPENSSL_MINIMUM)
    5252CYASSL_MINIMUM=3.0
  • trunk/libtransmission/crypto-utils-openssl.c

    r14422 r14575  
    1515#include <openssl/evp.h>
    1616#include <openssl/rand.h>
     17#include <openssl/opensslv.h>
    1718
    1819#include "transmission.h"
     
    142143***/
    143144
     145#if OPENSSL_VERSION_NUMBER < 0x0090802fL
     146
     147static EVP_CIPHER_CTX *
     148openssl_evp_cipher_context_new (void)
     149{
     150  EVP_CIPHER_CTX * ctx = tr_new (EVP_CIPHER_CTX, 1);
     151  if (ctx != NULL)
     152    EVP_CIPHER_CTX_init (ctx);
     153  return ctx;
     154}
     155
     156static void
     157openssl_evp_cipher_context_free (EVP_CIPHER_CTX * ctx)
     158{
     159  if (ctx)
     160    {
     161      EVP_CIPHER_CTX_cleanup (ctx);
     162      tr_free (ctx);
     163    }
     164}
     165
     166#define EVP_CIPHER_CTX_new() openssl_evp_cipher_context_new ()
     167#define EVP_CIPHER_CTX_free(x) openssl_evp_cipher_context_free ((x))
     168
     169#endif
     170
    144171tr_rc4_ctx_t
    145172tr_rc4_new (void)
Note: See TracChangeset for help on using the changeset viewer.