mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-29 05:28:00 +00:00
2030. [bug] We were being overly conservative when disabling
openssl engine support. [RT #16030]
This commit is contained in:
parent
8d18fc189f
commit
12b1bf8b14
3
CHANGES
3
CHANGES
@ -1,3 +1,6 @@
|
|||||||
|
2030. [bug] We were being overly conservative when disabling
|
||||||
|
openssl engine support. [RT #16030]
|
||||||
|
|
||||||
2029. [bug] host printed out the server multiple times when
|
2029. [bug] host printed out the server multiple times when
|
||||||
specified on the command line. [RT #15992]
|
specified on the command line. [RT #15992]
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Principal Author: Brian Wellington
|
* Principal Author: Brian Wellington
|
||||||
* $Id: openssl_link.c,v 1.7 2005/09/01 02:24:59 marka Exp $
|
* $Id: openssl_link.c,v 1.8 2006/05/23 04:49:19 marka Exp $
|
||||||
*/
|
*/
|
||||||
#ifdef OPENSSL
|
#ifdef OPENSSL
|
||||||
|
|
||||||
@ -41,7 +41,7 @@
|
|||||||
#include <openssl/conf.h>
|
#include <openssl/conf.h>
|
||||||
#include <openssl/crypto.h>
|
#include <openssl/crypto.h>
|
||||||
|
|
||||||
#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER < 0x00907000L)
|
#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER != 0x00907000L)
|
||||||
#define USE_ENGINE 1
|
#define USE_ENGINE 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -167,7 +167,7 @@ dst__openssl_init() {
|
|||||||
goto cleanup_rm;
|
goto cleanup_rm;
|
||||||
}
|
}
|
||||||
ENGINE_set_RAND(e, rm);
|
ENGINE_set_RAND(e, rm);
|
||||||
RAND_set_rand_method(e);
|
RAND_set_rand_method(rm);
|
||||||
#else
|
#else
|
||||||
RAND_set_rand_method(rm);
|
RAND_set_rand_method(rm);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user