Latest update.

crypto/evp/pmeth_gn.c

@@ -230,7 +230,7 @@ int EVP_PKEY_fromdata(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey, OSSL_PARAM params[])
     if (ctx->operation == EVP_PKEY_OP_PARAMFROMDATA)
         selection = OSSL_KEYMGMT_SELECT_ALL_PARAMETERS;
     else
-        selection = OSSL_KEYMGMT_SELECT_KEYPAIR;
+        selection = OSSL_KEYMGMT_SELECT_ALL;
     keydata = evp_keymgmt_util_fromdata(*ppkey, ctx->keymgmt, selection,
                                         params);
 
@@ -261,6 +261,6 @@ const OSSL_PARAM *EVP_PKEY_key_fromdata_settable(EVP_PKEY_CTX *ctx)
     /* We call fromdata_init to get ctx->keymgmt populated */
     if (fromdata_init(ctx, EVP_PKEY_OP_UNDEFINED))
         return evp_keymgmt_import_types(ctx->keymgmt,
-                                        OSSL_KEYMGMT_SELECT_KEYPAIR);
+                                        OSSL_KEYMGMT_SELECT_ALL);
     return NULL;
 }

crypto/evp/pmeth_lib.c

@@ -774,6 +774,13 @@ int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md)
 static int legacy_ctrl_to_param(EVP_PKEY_CTX *ctx, int keytype, int optype,
                                 int cmd, int p1, void *p2)
 {
+    /*
+     * GOST CMS format is different for different cipher algorithms.
+     * Most of other algorithms don't have such a difference
+     * so this ctrl is just ignored.
+     */
+    if (cmd == EVP_PKEY_CTRL_CIPHER)
+        return -2;
 # ifndef OPENSSL_NO_DH
     if (keytype == EVP_PKEY_DH) {
         switch (cmd) {
@@ -931,7 +938,7 @@ static int legacy_ctrl_str_to_param(EVP_PKEY_CTX *ctx, const char *name,
     else if (strcmp(name, "ecdh_cofactor_mode") == 0)
         name = OSSL_EXCHANGE_PARAM_EC_ECDH_COFACTOR_MODE;
     else if (strcmp(name, "ecdh_kdf_md") == 0)
-        name = OSSL_EXCHANGE_PARAM_KDF_TYPE;
+        name = OSSL_EXCHANGE_PARAM_KDF_DIGEST;
 # endif
 
     {