Add testing of OBJ_find_sigid_by_algs()

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17733)

(cherry picked from commit 065442165a3d339a7de469b4cd18a3f902c73443)

2 files changed, 46 insertions, 9 deletions

diff --git a/crypto/objects/obj_xref.c b/crypto/objects/obj_xref.c
index fc870c5691..18c7ef2b4a 100644
--- a/crypto/objects/obj_xref.c
+++ b/crypto/objects/obj_xref.c
@@ -112,7 +112,8 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid)
     const nid_triple **rv;
     int idx;
 
-    if (dig_nid == NID_undef || pkey_nid == NID_undef)
+    /* permitting searches for sig algs without digest: */
+    if (pkey_nid == NID_undef)
         return 0;
 
     tmp.hash_id = dig_nid;
diff --git a/test/upcallstest.c b/test/upcallstest.c
index c4ef714713..3bada5e2f9 100644
--- a/test/upcallstest.c
+++ b/test/upcallstest.c
@@ -27,6 +27,7 @@ static const OSSL_DISPATCH obj_dispatch_table[] = {
 static OSSL_FUNC_core_obj_add_sigid_fn *c_obj_add_sigid = NULL;
 static OSSL_FUNC_core_obj_create_fn *c_obj_create = NULL;
 
+/* test signature ids requiring digest */
 #define SIG_OID "1.3.6.1.4.1.16604.998877.1"
 #define SIG_SN "my-sig"
 #define SIG_LN "my-sig-long"
@@ -37,6 +38,14 @@ static OSSL_FUNC_core_obj_create_fn *c_obj_create = NULL;
 #define SIGALG_SN "my-sigalg"
 #define SIGALG_LN "my-sigalg-long"
 
+/* test signature ids requiring no digest */
+#define NODIG_SIG_OID "1.3.6.1.4.1.16604.998877.4"
+#define NODIG_SIG_SN "my-nodig-sig"
+#define NODIG_SIG_LN "my-nodig-sig-long"
+#define NODIG_SIGALG_OID "1.3.6.1.4.1.16604.998877.5"
+#define NODIG_SIGALG_SN "my-nodig-sigalg"
+#define NODIG_SIGALG_LN "my-nodig-sigalg-long"
+
 static int obj_provider_init(const OSSL_CORE_HANDLE *handle,
                              const OSSL_DISPATCH *in,
                              const OSSL_DISPATCH **out,
@@ -45,7 +54,7 @@ static int obj_provider_init(const OSSL_CORE_HANDLE *handle,
     *provctx = (void *)handle;
     *out = obj_dispatch_table;
 
-   for (; in->function_id != 0; in++) {
+    for (; in->function_id != 0; in++) {
         switch (in->function_id) {
         case OSSL_FUNC_CORE_OBJ_ADD_SIGID:
             c_obj_add_sigid = OSSL_FUNC_core_obj_add_sigid(in);
@@ -65,17 +74,18 @@ static int obj_provider_init(const OSSL_CORE_HANDLE *handle,
             || !c_obj_create(handle, SIGALG_OID, SIGALG_SN, SIGALG_LN))
         return 0;
 
+    if (!c_obj_create(handle, NODIG_SIG_OID, NODIG_SIG_SN, NODIG_SIG_LN)
+            || !c_obj_create(handle, NODIG_SIGALG_OID, NODIG_SIGALG_SN, NODIG_SIGALG_LN))
+        return 0;
+
     if (!c_obj_add_sigid(handle, SIGALG_OID, DIGEST_SN, SIG_LN))
         return 0;
 
     /* additional tests checking empty digest algs are accepted, too */
-    if (!c_obj_add_sigid(handle, SIGALG_OID, "", SIG_LN))
+    if (!c_obj_add_sigid(handle, NODIG_SIGALG_OID, "", NODIG_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))
+    if (c_obj_add_sigid(handle, NODIG_SIGALG_OID, "NonsenseAlg", NODIG_SIG_LN))
         return 0;
 
     return 1;
@@ -85,7 +95,7 @@ static int obj_create_test(void)
 {
     OSSL_LIB_CTX *libctx = OSSL_LIB_CTX_new();
     OSSL_PROVIDER *objprov = NULL;
-    int sigalgnid, digestnid, signid;
+    int sigalgnid, digestnid, signid, foundsid;
     int testresult = 0;
 
     if (!TEST_ptr(libctx))
@@ -107,13 +117,39 @@ static int obj_create_test(void)
         goto err;
 
     /* Check empty digest alg storage capability */
-    sigalgnid = OBJ_txt2nid(SIG_OID);
+    sigalgnid = OBJ_txt2nid(NODIG_SIGALG_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;
 
+    /* Testing OBJ_find_sigid_by_algs */
+    /* First check exact sig/digest recall: */
+    sigalgnid = OBJ_sn2nid(SIGALG_SN);
+    digestnid = OBJ_sn2nid(DIGEST_SN);
+    signid = OBJ_ln2nid(SIG_LN);
+    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) ||
+        (foundsid != sigalgnid))
+        return 0;
+    /* Check wrong signature/digest combination is rejected */
+    if ((OBJ_find_sigid_by_algs(&foundsid, OBJ_sn2nid("SHA512"), signid)) &&
+        (foundsid == sigalgnid))
+        return 0;
+    /* Now also check signature not needing digest is found */
+    /* a) when some digest is given */
+    sigalgnid = OBJ_sn2nid(NODIG_SIGALG_SN);
+    digestnid = OBJ_sn2nid("SHA512");
+    signid = OBJ_ln2nid(NODIG_SIG_LN);
+    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) ||
+        (foundsid != sigalgnid))
+        return 0;
+    /* b) when NID_undef is passed */
+    digestnid = NID_undef;
+    if ((!OBJ_find_sigid_by_algs(&foundsid, digestnid, signid)) ||
+        (foundsid != sigalgnid))
+        return 0;
+
     testresult = 1;
  err:
     OSSL_PROVIDER_unload(objprov);