summaryrefslogtreecommitdiffstats
path: root/apps/genpkey.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2006-07-12 18:00:20 +0000
committerDr. Stephen Henson <steve@openssl.org>2006-07-12 18:00:20 +0000
commitb3c6a331853c125985cdf0d3ae60e1894974c3eb (patch)
treef82c084f627deb9acddc0de382e16aee51edd33a /apps/genpkey.c
parent31780d0e2603f4c73bb69f921230db567acdc1f5 (diff)
In genpkey, also look for algorithm string name in any supplied ENGINE.
Diffstat (limited to 'apps/genpkey.c')
-rw-r--r--apps/genpkey.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/genpkey.c b/apps/genpkey.c
index 96801c7045..1d1a53e84b 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -375,14 +375,20 @@ static int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
BIO_puts(err, "Algorithm already set!\n");
return 0;
}
+
ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1);
+ if (!ameth && e)
+ ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1);
+
if (!ameth)
{
BIO_printf(bio_err, "Algorithm %s not found\n", algname);
return 0;
}
+ ERR_clear_error();
+
EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
#ifndef OPENSSL_NO_ENGINE
if (tmpeng)