[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/evp Ensure that SHA3...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3b8a84eb4d66
branches:  trunk
changeset: 752593:3b8a84eb4d66
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Mar 01 21:47:43 2010 +0000

description:
Ensure that SHA384 always calls the SHA384 functions.
Should fix PR 42881.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 450b478c7a22 -r 3b8a84eb4d66 crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c
--- a/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c      Mon Mar 01 21:46:58 2010 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/evp/m_sha1.c      Mon Mar 01 21:47:43 2010 +0000
@@ -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,