From 987d7da3277423b580b66232985a21af38ae4f79 Mon Sep 17 00:00:00 2001 From: Pauli Date: Tue, 15 Jun 2021 18:48:35 +1000 Subject: Include a local static buffer for the SHA helper functions This functionality existed in 1.1.1 but was lost. Fixes #15718 Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/15752) --- crypto/sha/sha1_one.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'crypto/sha') diff --git a/crypto/sha/sha1_one.c b/crypto/sha/sha1_one.c index d6f5d1ecce..d1fa3d84f1 100644 --- a/crypto/sha/sha1_one.c +++ b/crypto/sha/sha1_one.c @@ -37,25 +37,45 @@ unsigned char *ossl_sha1(const unsigned char *d, size_t n, unsigned char *md) unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md) { + static unsigned char m[SHA_DIGEST_LENGTH]; + + if (md == NULL) + md = m; return EVP_Q_digest(NULL, "SHA1", NULL, d, n, md, NULL) ? md : NULL; } unsigned char *SHA224(const unsigned char *d, size_t n, unsigned char *md) { + static unsigned char m[SHA224_DIGEST_LENGTH]; + + if (md == NULL) + md = m; return EVP_Q_digest(NULL, "SHA224", NULL, d, n, md, NULL) ? md : NULL; } unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md) { + static unsigned char m[SHA256_DIGEST_LENGTH]; + + if (md == NULL) + md = m; return EVP_Q_digest(NULL, "SHA256", NULL, d, n, md, NULL) ? md : NULL; } unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md) { + static unsigned char m[SHA384_DIGEST_LENGTH]; + + if (md == NULL) + md = m; return EVP_Q_digest(NULL, "SHA384", NULL, d, n, md, NULL) ? md : NULL; } unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md) { + static unsigned char m[SHA512_DIGEST_LENGTH]; + + if (md == NULL) + md = m; return EVP_Q_digest(NULL, "SHA512", NULL, d, n, md, NULL) ? md : NULL; } -- cgit v1.2.3