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

bk: 508aca74j_yFndNfIPe3_j4c8q-6Vg

diff --git a/ChangeLog b/ChangeLog
index 62a5a685c5732787d44a8a9f8e0504d1e97cc108..357de4756b8709b46ea50458b4a22275a660a443 100644 (file)
--- 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 267f84812e0e6b5c435228f5ccb0f7e340a7b2c5..9f43378f81c581201a2dfb60024cf178627b12be 100644 (file)
--- 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)    \