[Bug 3471] Check for openssl/[ch]mac.h

 - added missing check in code

bk: 5c00cbeb0iI9QHS8sS7ibmDITg1ioA

diff --git a/ChangeLog b/ChangeLog
index f381a093cf948c1202162000eaf2d8abbf1a1dcf..2e95f745e83f5edc0b72fb382b47441514ffffa0 100644 (file)
--- 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 bd98ab21ab106bc4f81ee2b17d8dd0966be5189b..48c5c4d5ec6eeed3a89213798ddca8c5826797f5 100644 (file)
--- 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 */
                /*