Allow import of unknown keys via generic type

This allows to use SKEY even w/o a specific skey managment available, however it bears the risk of allowing users to mispell the key type and not see the error of their ways until they expect a specific provider to pick this up and fail. Signed-off-by: Simo Sorce <[email protected]>
beldmit · Jan 28, 2025 · ad565e0 · ad565e0
1 parent c59d076
commit ad565e0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/crypto/evp/s_lib.c b/crypto/evp/s_lib.c
@@ -65,8 +65,15 @@ EVP_SKEY *EVP_SKEY_import(OSSL_LIB_CTX *libctx, const char *skeymgmtname, const
 
     skeymgmt = EVP_SKEYMGMT_fetch(libctx, skeymgmtname, propquery);
     if (skeymgmt == NULL) {
-        ERR_raise(ERR_LIB_EVP, ERR_R_FETCH_FAILED);
-        goto err;
+        /*
+         * if the specific key_type is unknown, attempt to use the generic
+         * key management
+         */
+        skeymgmt = EVP_SKEYMGMT_fetch(libctx, OSSL_SKEY_TYPE_GENERIC, propquery);
+        if (skeymgmt == NULL) {
+            ERR_raise(ERR_LIB_EVP, ERR_R_FETCH_FAILED);
+            goto err;
+        }
     }
     skey->skeymgmt = skeymgmt;
 

diff --git a/test/evp_skey_test.c b/test/evp_skey_test.c
@@ -216,7 +216,7 @@ static int test_des_raw_skey(void)
         || (params = OSSL_PARAM_BLD_to_param(tmpl)) == NULL)
         goto end;
 
-    skey = EVP_SKEY_import(libctx, "GENERIC-SECRET", NULL, OSSL_SKEYMGMT_SELECT_ALL, params);
+    skey = EVP_SKEY_import(libctx, "DES", NULL, OSSL_SKEYMGMT_SELECT_ALL, params);
     if (!TEST_ptr(skey))
         goto end;