From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 26 Oct 2012 17:37:56 +0000 (-0400)
Subject: [Bug 2296] Update fix for Bug 2294 to handle --without-crypto
X-Git-Tag: NTP_4_2_7P316~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea3c1d2d61ac3f4c6bc89d4c9f49ac247b7e3cd4;p=thirdparty%2Fntp.git

[Bug 2296] Update fix for Bug 2294 to handle --without-crypto

bk: 508aca74j_yFndNfIPe3_j4c8q-6Vg
---

diff --git a/ChangeLog b/ChangeLog
index 62a5a685c..357de4756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2296] Update fix for Bug 2294 to handle --without-crypto.
 (4.2.7p315) 2012/10/26 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2294] ntpd crashes in FIPS mode.
 (4.2.7p314) 2012/10/23 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/include/ntp_md5.h b/include/ntp_md5.h
index 267f84812..9f43378f8 100644
--- a/include/ntp_md5.h
+++ b/include/ntp_md5.h
@@ -24,7 +24,11 @@
 
   typedef MD5_CTX			EVP_MD_CTX;
 # define EVP_get_digestbynid(t)		NULL
-# define EVP_DigestInit(c, dt)		MD5Init(c)
+# define EVP_md5(v)			NULL
+# define EVP_MD_CTX_init(c)
+# define EVP_MD_CTX_set_flags(c, f)
+# define EVP_DigestInit(c, dt)		(MD5Init(c), 1)
+# define EVP_DigestInit_ex(c, dt, i)	(MD5Init(c), 1)
 # define EVP_DigestUpdate(c, p, s)	MD5Update(c, (const void *)(p), \
 						  s)
 # define EVP_DigestFinal(c, d, pdl)	\