Commit 5f859bc2 authored by Rainer Jung's avatar Rainer Jung
Browse files

Support for OpenSSL 1.1.0: 

- symbols get_rfc..._prime_... have been
  renamed to BN_get_rfc..._prime_...

Backport of r1740652 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1755865 13f79535-47bb-0310-9956-ffa450edef68
parent 9e10d369

modules/ssl/ssl_engine_init.c

+7 −7
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) 
#endif



/*

 * Grab well-defined DH parameters from OpenSSL, see the get_rfc*

 * Grab well-defined DH parameters from OpenSSL, see the BN_get_rfc*

 * functions in <openssl/bn.h> for all available primes.

 */

static DH *make_dh_params(BIGNUM *(*prime)(BIGNUM *))
@@ -102,12 +102,12 @@ static struct dhparam { 
    DH *dh;                           /* ...this, used for keys.... */

    const unsigned int min;           /* ...of length >= this. */

} dhparams[] = {

    { get_rfc3526_prime_8192, NULL, 6145 },

    { get_rfc3526_prime_6144, NULL, 4097 },

    { get_rfc3526_prime_4096, NULL, 3073 },

    { get_rfc3526_prime_3072, NULL, 2049 },

    { get_rfc3526_prime_2048, NULL, 1025 },

    { get_rfc2409_prime_1024, NULL, 0 }

    { BN_get_rfc3526_prime_8192, NULL, 6145 },

    { BN_get_rfc3526_prime_6144, NULL, 4097 },

    { BN_get_rfc3526_prime_4096, NULL, 3073 },

    { BN_get_rfc3526_prime_3072, NULL, 2049 },

    { BN_get_rfc3526_prime_2048, NULL, 1025 },

    { BN_get_rfc2409_prime_1024, NULL, 0 }

};



static void init_dh_params(void)

modules/ssl/ssl_private.h

+14 −6
Original line number Diff line number Diff line
@@ -200,6 +200,14 @@ 
#endif /* !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) */



#if OPENSSL_VERSION_NUMBER < 0x10100000L

#define BN_get_rfc2409_prime_768   get_rfc2409_prime_768

#define BN_get_rfc2409_prime_1024  get_rfc2409_prime_1024

#define BN_get_rfc3526_prime_1536  get_rfc3526_prime_1536

#define BN_get_rfc3526_prime_2048  get_rfc3526_prime_2048

#define BN_get_rfc3526_prime_3072  get_rfc3526_prime_3072

#define BN_get_rfc3526_prime_4096  get_rfc3526_prime_4096

#define BN_get_rfc3526_prime_6144  get_rfc3526_prime_6144

#define BN_get_rfc3526_prime_8192  get_rfc3526_prime_8192

#define BIO_set_init(x,v)          (x->init=v)

#define BIO_get_data(x)            (x->ptr)

#define BIO_set_data(x,v)          (x->ptr=v)