[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  2080da84a49b0c52fc8c6e6caef5d373235bd3e4 (commit)
      from  7c78bd4be810ddceb8f13585a921946cc98f5fbd (commit)


- Log -----------------------------------------------------------------
commit 2080da84a49b0c52fc8c6e6caef5d373235bd3e4
Author: Michael Baentsch <info at baentsch.ch>
Date:   Mon Dec 20 11:01:00 2021 +0100

    improving tests for adding sigalg with empty digest
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17315)

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

Summary of changes:
 test/upcallstest.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/upcallstest.c b/test/upcallstest.c
index 76899fee3d..c4ef714713 100644
--- a/test/upcallstest.c
+++ b/test/upcallstest.c
@@ -71,11 +71,12 @@ static int obj_provider_init(const OSSL_CORE_HANDLE *handle,
     /* additional tests checking empty digest algs are accepted, too */
     if (!c_obj_add_sigid(handle, SIGALG_OID, "", SIG_LN))
         return 0;
-    if (!c_obj_add_sigid(handle, SIGALG_OID, NULL, SIG_LN))
-        return 0;
     /* checking wrong digest alg name is rejected: */
     if (c_obj_add_sigid(handle, SIGALG_OID, "NonsenseAlg", SIG_LN))
         return 0;
+    /* Testing actual triplet addition under separate sig alg */
+    if (!c_obj_add_sigid(handle, SIG_OID, NULL, SIG_LN))
+        return 0;
 
     return 1;
 }
@@ -105,6 +106,14 @@ static int obj_create_test(void)
             || !TEST_int_eq(signid, OBJ_ln2nid(SIG_LN)))
         goto err;
 
+    /* Check empty digest alg storage capability */
+    sigalgnid = OBJ_txt2nid(SIG_OID);
+    if (!TEST_int_ne(sigalgnid, NID_undef)
+            || !TEST_true(OBJ_find_sigid_algs(sigalgnid, &digestnid, &signid))
+            || !TEST_int_eq(digestnid, NID_undef)
+            || !TEST_int_ne(signid, NID_undef))
+        goto err;
+
     testresult = 1;
  err:
     OSSL_PROVIDER_unload(objprov);