X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Frand%2Frand_lcl.h;h=618a8ec899cec833699fd3f3f5ac0be2caa4d3eb;hb=38049c2bb9f609d767cfbda8d5959e227132fcc9;hp=44d7cbba673e4525e5ae00fcf8294f76a1328281;hpb=323f289c480b0a8eb15ed3be2befbcc0f86e8904;p=oweals%2Fopenssl.git diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h index 44d7cbba67..618a8ec899 100644 --- a/crypto/rand/rand_lcl.h +++ b/crypto/rand/rand_lcl.h @@ -1,4 +1,4 @@ -/* crypto/rand/md_rand.c */ +/* crypto/rand/rand_lcl.h */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -130,25 +130,28 @@ #endif #include -#define MD_CTX EVP_MD_CTX #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 #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,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 #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,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 #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,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 #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,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