Like MD_Init, MD now must include a NULL engine pointer in its definition.

[openssl.git] / crypto / rand / rand_lcl.h

diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h
index c69d6a9785e72e8456b7b76ea4f21b73904e85ce..618a8ec899cec833699fd3f3f5ac0be2caa4d3eb 100644 (file)
--- a/crypto/rand/rand_lcl.h
+++ b/crypto/rand/rand_lcl.h
@@ -131,23 +131,27 @@
 
 #include <openssl/evp.h>
 #define MD_Update(a,b,c)       EVP_DigestUpdate(a,b,c)
-#define        MD_Final(a,b)           EVP_DigestFinal(a,b,NULL)
+#define        MD_Final(a,b)           EVP_DigestFinal_ex(a,b,NULL)
 #if defined(USE_MD5_RAND)
+#include <openssl/md5.h>
 #define MD_DIGEST_LENGTH       MD5_DIGEST_LENGTH
-#define MD_Init(a)             EVP_DigestInit(a,EVP_md5())
-#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_md5())
+#define MD_Init(a)             EVP_DigestInit_ex(a,EVP_md5(), NULL)
+#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_md5(), NULL)
 #elif defined(USE_SHA1_RAND)
+#include <openssl/sha.h>
 #define MD_DIGEST_LENGTH       SHA_DIGEST_LENGTH
-#define MD_Init(a)             EVP_DigestInit(a,EVP_sha1())
-#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_sha1())
+#define MD_Init(a)             EVP_DigestInit_ex(a,EVP_sha1(), NULL)
+#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_sha1(), NULL)
 #elif defined(USE_MDC2_RAND)
+#include <openssl/mdc2.h>
 #define MD_DIGEST_LENGTH       MDC2_DIGEST_LENGTH
-#define MD_Init(a)             EVP_DigestInit(a,EVP_mdc2())
-#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_mdc2())
+#define MD_Init(a)             EVP_DigestInit_ex(a,EVP_mdc2(), NULL)
+#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_mdc2(), NULL)
 #elif defined(USE_MD2_RAND)
+#include <openssl/md2.h>
 #define MD_DIGEST_LENGTH       MD2_DIGEST_LENGTH
-#define MD_Init(a)             EVP_DigestInit(a,EVP_md2())
-#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_md2())
+#define MD_Init(a)             EVP_DigestInit_ex(a,EVP_md2(), NULL)
+#define        MD(a,b,c)               EVP_Digest(a,b,c,NULL,EVP_md2(), NULL)
 #endif