[openssl] master update

Dr. Paul Dale pauli at openssl.org
Wed Jun 16 08:31:29 UTC 2021


The branch master has been updated
       via  43ba1573ce54777b77c1990973b50731062d45b7 (commit)
       via  987d7da3277423b580b66232985a21af38ae4f79 (commit)
      from  f763e1351446da952c54e0ea85ec26a436cf4815 (commit)


- Log -----------------------------------------------------------------
commit 43ba1573ce54777b77c1990973b50731062d45b7
Author: Pauli <pauli at openssl.org>
Date:   Tue Jun 15 19:57:36 2021 +1000

    test: add test cases for SHAxxx helper functions
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15752)

commit 987d7da3277423b580b66232985a21af38ae4f79
Author: Pauli <pauli at openssl.org>
Date:   Tue Jun 15 18:48:35 2021 +1000

    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 <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15752)

-----------------------------------------------------------------------

Summary of changes:
 crypto/sha/sha1_one.c                         |  20 +++++
 test/build.info                               |   6 +-
 test/recipes/{10-test_exp.t => 15-test_sha.t} |   2 +-
 test/sha_test.c                               | 110 ++++++++++++++++++++++++++
 4 files changed, 136 insertions(+), 2 deletions(-)
 copy test/recipes/{10-test_exp.t => 15-test_sha.t} (90%)
 create mode 100644 test/sha_test.c

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;
 }
diff --git a/test/build.info b/test/build.info
index eeb2845638..e6bb2e240a 100644
--- a/test/build.info
+++ b/test/build.info
@@ -31,7 +31,7 @@ IF[{- !$disabled{tests} -}]
           aborttest test_test pkcs12_format_test \
           sanitytest rsa_complex exdatatest bntest \
           ecstresstest gmdifftest pbelutest \
-          destest mdc2test \
+          destest mdc2test sha_test \
           exptest pbetest \
           evp_pkey_provided_test evp_test evp_extra_test evp_extra_test2 \
           evp_fetch_prov_test evp_libctx_test ossl_store_test \
@@ -113,6 +113,10 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[mdc2test]=../include ../apps/include
   DEPEND[mdc2test]=../libcrypto libtestutil.a
 
+  SOURCE[sha_test]=sha_test.c
+  INCLUDE[sha_test]=../include ../apps/include
+  DEPEND[sha_test]=../libcrypto libtestutil.a
+
   SOURCE[enginetest]=enginetest.c
   INCLUDE[enginetest]=../include ../apps/include
   DEPEND[enginetest]=../libcrypto libtestutil.a
diff --git a/test/recipes/10-test_exp.t b/test/recipes/15-test_sha.t
similarity index 90%
copy from test/recipes/10-test_exp.t
copy to test/recipes/15-test_sha.t
index d83a25722b..c58b46c4cb 100644
--- a/test/recipes/10-test_exp.t
+++ b/test/recipes/15-test_sha.t
@@ -9,4 +9,4 @@
 
 use OpenSSL::Test::Simple;
 
-simple_test("test_exp", "exptest");
+simple_test("test_sha", "sha_test");
diff --git a/test/sha_test.c b/test/sha_test.c
new file mode 100644
index 0000000000..4285e703c5
--- /dev/null
+++ b/test/sha_test.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include <string.h>
+#include <openssl/sha.h>
+#include "testutil.h"
+
+static int test_static_sha_common(const char *input, size_t length,
+                                  const unsigned char *out,
+                                  unsigned char *(*md)(const unsigned char *d,
+                                                       size_t n,
+                                                       unsigned char *md))
+{
+    unsigned char buf[EVP_MAX_MD_SIZE], *sbuf;
+    const unsigned char *in = (unsigned char *)input;
+    const size_t in_len = strlen(input);
+
+    sbuf = (*md)(in, in_len, buf);
+    if (!TEST_ptr(sbuf)
+            || !TEST_ptr_eq(sbuf, buf)
+            || !TEST_mem_eq(sbuf, length, out, length))
+        return 0;
+    sbuf = (*md)(in, in_len, NULL);
+    if (!TEST_ptr(sbuf)
+            || !TEST_ptr_ne(sbuf, buf)
+            || !TEST_mem_eq(sbuf, length, out, length))
+        return 0;
+    return 1;
+}
+
+static int test_static_sha1(void)
+{
+    static const unsigned char output[SHA_DIGEST_LENGTH] = {
+        0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a,
+        0xba, 0x3e, 0x25, 0x71, 0x78, 0x50, 0xc2, 0x6c,
+        0x9c, 0xd0, 0xd8, 0x9d
+    };
+
+    return test_static_sha_common("abc", SHA_DIGEST_LENGTH, output, &SHA1);
+}
+
+static int test_static_sha224(void)
+{
+    static const unsigned char output[SHA224_DIGEST_LENGTH] = {
+        0x23, 0x09, 0x7d, 0x22, 0x34, 0x05, 0xd8, 0x22,
+        0x86, 0x42, 0xa4, 0x77, 0xbd, 0xa2, 0x55, 0xb3,
+        0x2a, 0xad, 0xbc, 0xe4, 0xbd, 0xa0, 0xb3, 0xf7,
+        0xe3, 0x6c, 0x9d, 0xa7
+    };
+
+    return test_static_sha_common("abc", SHA224_DIGEST_LENGTH, output, &SHA224);
+}
+
+static int test_static_sha256(void)
+{
+    static const unsigned char output[SHA256_DIGEST_LENGTH] = {
+        0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea,
+        0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,
+        0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c,
+        0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad
+    };
+
+    return test_static_sha_common("abc", SHA256_DIGEST_LENGTH, output, &SHA256);
+}
+
+static int test_static_sha384(void)
+{
+    static const unsigned char output[SHA384_DIGEST_LENGTH] = {
+        0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b,
+        0xb5, 0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07,
+        0x27, 0x2c, 0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63,
+        0x1a, 0x8b, 0x60, 0x5a, 0x43, 0xff, 0x5b, 0xed,
+        0x80, 0x86, 0x07, 0x2b, 0xa1, 0xe7, 0xcc, 0x23,
+        0x58, 0xba, 0xec, 0xa1, 0x34, 0xc8, 0x25, 0xa7
+    };
+
+    return test_static_sha_common("abc", SHA384_DIGEST_LENGTH, output, &SHA384);
+}
+
+static int test_static_sha512(void)
+{
+    static const unsigned char output[SHA512_DIGEST_LENGTH] = {
+        0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba,
+        0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31,
+        0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2,
+        0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a,
+        0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8,
+        0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd,
+        0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e,
+        0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f
+    };
+
+    return test_static_sha_common("abc", SHA512_DIGEST_LENGTH, output, &SHA512);
+}
+
+int setup_tests(void)
+{
+    ADD_TEST(test_static_sha1);
+    ADD_TEST(test_static_sha224);
+    ADD_TEST(test_static_sha256);
+    ADD_TEST(test_static_sha384);
+    ADD_TEST(test_static_sha512);
+    return 1;
+}


More information about the openssl-commits mailing list