]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
4881. [bug] Only include dst_openssl.h when OpenSSL is required.
authorMark Andrews <marka@isc.org>
Tue, 30 Jan 2018 04:21:02 +0000 (15:21 +1100)
committerMark Andrews <marka@isc.org>
Tue, 30 Jan 2018 04:22:18 +0000 (15:22 +1100)
                        [RT #47068]

(cherry picked from commit a64503c7361e6629822428b0455ee98bbda75bf0)

CHANGES
lib/dns/hmac_link.c

diff --git a/CHANGES b/CHANGES
index f0706433390cb08c94428ca99d970010026747f0..1db4cc6d46ed33b6ab11480c9432d8532be243a9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4881.  [bug]           Only include dst_openssl.h when OpenSSL is required.
+                       [RT #47068]
+
 4879.  [bug]           dns_rdata_caa:value_len is was small. [RT #47086]
 
 4878.  [bug]           List 'ply' as a requirement for the 'isc' python
index b8473793f532275f6d8da62a0e2426e73daeafea..d4df150c75506f493c3d7a408076a33d3a7e416e 100644 (file)
@@ -50,7 +50,9 @@
 #include <dst/result.h>
 
 #include "dst_internal.h"
-#include "dst_openssl.h"
+#ifdef HAVE_FIPS_MODE
+#include "dst_openssl.h"       /* FIPS_mode() prototype */
+#endif
 #include "dst_parse.h"
 
 #ifndef PK11_MD5_DISABLE