[Bug 2296] Fix compile problem with building with old OpenSSL

bk: 509f668bp5iw4XKk94yqKaph7EJy6w

diff --git a/ChangeLog b/ChangeLog
index 820dba9b50ad877e4ce0ff5027af0724e64e9c8c..e77f6028486741c4f044b09e8e9c34450ff85f05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2296] Fix compile problem with building with old OpenSSL.
 (4.2.7p318) 2012/11/05 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2301] Remove spurious debug output from ntpq.
 (4.2.7p317) 2012/11/05 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
index 5603310a7dda36f9cf1e6a80fffdb6fa18f6ec0a..ffabc47c7d0978ee9bee010f471ea6244513b204 100644 (file)
--- a/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@ -34,11 +34,15 @@ MD5authencrypt(
         * was creaded.
         */
        INIT_SSL();
+#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x0090700fL
        if (!EVP_DigestInit(&ctx, EVP_get_digestbynid(type))) {
                msyslog(LOG_ERR,
                    "MAC encrypt: digest init failed");
                return (0);
        }
+#else
+       EVP_DigestInit(&ctx, EVP_get_digestbynid(type));
+#endif
        EVP_DigestUpdate(&ctx, key, cache_secretsize);
        EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);
        EVP_DigestFinal(&ctx, digest, &len);
@@ -71,11 +75,15 @@ MD5authdecrypt(
         * was created.
         */
        INIT_SSL();
+#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x0090700fL
        if (!EVP_DigestInit(&ctx, EVP_get_digestbynid(type))) {
                msyslog(LOG_ERR,
                    "MAC decrypt: digest init failed");
                return (0);
        }
+#else
+       EVP_DigestInit(&ctx, EVP_get_digestbynid(type));
+#endif
        EVP_DigestUpdate(&ctx, key, cache_secretsize);
        EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);
        EVP_DigestFinal(&ctx, digest, &len);
@@ -105,6 +113,8 @@ addr2refid(sockaddr_u *addr)
                return (NSRCADR(addr));
 
        INIT_SSL();
+
+#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER >= 0x0090700fL
        EVP_MD_CTX_init(&ctx);
 #ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW
        /* MD5 is not used as a crypto hash here. */
@@ -115,6 +125,10 @@ addr2refid(sockaddr_u *addr)
                    "MD5 init failed");
                exit(1);
        }
+#else
+       EVP_DigestInit(&ctx, EVP_md5());
+#endif
+
        EVP_DigestUpdate(&ctx, (u_char *)PSOCK_ADDR6(addr),
            sizeof(struct in6_addr));
        EVP_DigestFinal(&ctx, digest, &len);