From: Juergen Perlinger <perlinger@ntp.org>
Date: Fri, 30 Nov 2018 05:34:35 +0000 (+0100)
Subject: [Bug 3471] Check for openssl/[ch]mac.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c47c55769933c0789c79482c59fa1de85887a70;p=thirdparty%2Fntp.git

[Bug 3471] Check for openssl/[ch]mac.h
 - added missing check in code

bk: 5c00cbeb0iI9QHS8sS7ibmDITg1ioA
---

diff --git a/ChangeLog b/ChangeLog
index f381a093c..2e95f745e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,7 @@
   - applied patch by Gerry Garvey
 * [Bug 3471] Check for openssl/[ch]mac.h.  HStenn.
   - add #define ENABLE_CMAC support in configure.  HStenn.
+  - added missing check, reported by Reinhard Max <perlinger@ntp.org>
 * [Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL <perlinger@ntp.org>
 * [Bug 3469] Incomplete string compare [...] in is_refclk_addr <perlinger@ntp.org>
   - patch by Stephen Friedl
diff --git a/libntp/authreadkeys.c b/libntp/authreadkeys.c
index bd98ab21a..48c5c4d5e 100644
--- a/libntp/authreadkeys.c
+++ b/libntp/authreadkeys.c
@@ -221,12 +221,14 @@ authreadkeys(
 			log_maybe(NULL,
 				  "authreadkeys: invalid type for key %d",
 				  keyno);
+#  ifdef ENABLE_CMAC
 		} else if (NID_cmac != keytype &&
 				EVP_get_digestbynid(keytype) == NULL) {
 			log_maybe(NULL,
 				  "authreadkeys: no algorithm for key %d",
 				  keyno);
 			keytype = 0;
+#  endif /* ENABLE_CMAC */
 		}
 #else	/* !OPENSSL follows */
 		/*