Commit ea7150b0 authored by Bodo Möller's avatar Bodo Möller
Browse files

The various hash #includes in rand_lcl.h *are* needed despite 

<openssl/evp.h> is now used (MD_DIGEST_LENGTH definitions!).
No need to include such headers directly in md_rand.c.
parent cb42ce0b

crypto/rand/md_rand.c

+0 −2
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ 


#include <openssl/crypto.h>

#include <openssl/err.h>

#include <openssl/evp.h>

#include <openssl/sha.h>



#ifdef BN_DEBUG

# define PREDICT

crypto/rand/rand_lcl.h

+4 −0
Original line number Diff line number Diff line
@@ -133,18 +133,22 @@ 
#define MD_Update(a,b,c)	EVP_DigestUpdate(a,b,c)

#define	MD_Final(a,b)		EVP_DigestFinal(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())

#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())

#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())

#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())