ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '506-print-fips-mode-v9_12-fix' into 'v9_12'

Browse Source 
Fix the FIPS mode merge

See merge request isc-projects/bind9!871
This commit is contained in:
Ondřej Surý
2018-10-22 15:56:13 -04:00
parent cf30a5221b a5116a777c
commit 5a2b525abf
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dns/openssl_link.c
+17 -16
View File
@@ -80,22 +80,6 @@ entropy_getpseudo(unsigned char *buf, int num) {
return (-1);
result = dst__entropy_getdata(buf, (unsigned int) num, true);
return (result == ISC_R_SUCCESS ? 1 : -1);
static void
enable_fips_mode(void) {
#ifdef HAVE_FIPS_MODE
if (FIPS_mode() != 0) {
/*
* FIPS mode is already enabled.
*/
return;
}
if (FIPS_mode_set(1) == 0) {
dst__openssl_toresult2("FIPS_mode_set", DST_R_OPENSSLFAILURE);
exit(1);
}
#endif /* HAVE_FIPS_MODE */
}
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
@@ -206,6 +190,23 @@ _set_thread_id(CRYPTO_THREADID *id)
}
#endif
static void
enable_fips_mode(void) {
#ifdef HAVE_FIPS_MODE
if (FIPS_mode() != 0) {
/*
* FIPS mode is already enabled.
*/
return;
}
if (FIPS_mode_set(1) == 0) {
dst__openssl_toresult2("FIPS_mode_set", DST_R_OPENSSLFAILURE);
exit(1);
}
#endif /* HAVE_FIPS_MODE */
}
isc_result_t
dst__openssl_init(const char *engine) {
isc_result_t result;