1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

Support for OpenSSL 1.1.0:

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740652 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Rainer Jung
2016-04-23 12:36:43 +00:00
parent d9839543b6
commit 6ba30d2c2b
2 changed files with 21 additions and 13 deletions

View File

@@ -74,7 +74,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 *))
@@ -105,12 +105,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)