Module Name: src Committed By: joerg Date: Mon Mar 1 21:47:43 UTC 2010
Modified Files: src/crypto/external/bsd/openssl/dist/crypto/evp: m_sha1.c Log Message: Ensure that SHA384 always calls the SHA384 functions. Should fix PR 42881. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.2 src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.3 --- src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c:1.2 Sun Jul 19 23:30:39 2009 +++ src/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c Mon Mar 1 21:47:43 2010 @@ -158,8 +158,12 @@ static int init512(EVP_MD_CTX *ctx) { return SHA512_Init(ctx->md_data); } /* See comment in SHA224/256 section */ +static int update384(EVP_MD_CTX *ctx,const void *data,size_t count) + { return SHA384_Update(ctx->md_data,data,count); } static int update512(EVP_MD_CTX *ctx,const void *data,size_t count) { return SHA512_Update(ctx->md_data,data,count); } +static int final384(EVP_MD_CTX *ctx,unsigned char *md) + { return SHA384_Final(md,ctx->md_data); } static int final512(EVP_MD_CTX *ctx,unsigned char *md) { return SHA512_Final(md,ctx->md_data); } @@ -170,8 +174,8 @@ SHA384_DIGEST_LENGTH, EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_DIGALGID_ABSENT, init384, - update512, - final512, + update384, + final384, NULL, NULL, EVP_PKEY_RSA_method,