generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix engine key support in cms and req utilities.

Browse Source 
PR#4246 and PR#4266

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2016-02-11 15:51:31 +00:00
parent 7b548d3f11
commit 43db7aa2de
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cms.c
View File

@ -206,7 +206,7 @@ OPTIONS cms_options[] = {
{"recip", OPT_RECIP, '<', "Recipient cert file for decryption"}, {"recip", OPT_RECIP, '<', "Recipient cert file for decryption"},
{"certsout", OPT_CERTSOUT, '>', "Certificate output file"}, {"certsout", OPT_CERTSOUT, '>', "Certificate output file"},
{"md", OPT_MD, 's'}, {"md", OPT_MD, 's'},
{"inkey", OPT_INKEY, '<', {"inkey", OPT_INKEY, 's',
"Input private key (if not signer or recipient)"}, "Input private key (if not signer or recipient)"},
{"keyform", OPT_KEYFORM, 'f', "Input private key format (PEM or ENGINE)"}, {"keyform", OPT_KEYFORM, 'f', "Input private key format (PEM or ENGINE)"},
{"keyopt", OPT_KEYOPT, 's', "Set public key parameters as n:v pairs"}, {"keyopt", OPT_KEYOPT, 's', "Set public key parameters as n:v pairs"},

8
apps/req.c
View File

@ -136,8 +136,8 @@ OPTIONS req_options[] = {
{"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"}, {"outform", OPT_OUTFORM, 'F', "Output format - DER or PEM"},
{"in", OPT_IN, '<', "Input file"}, {"in", OPT_IN, '<', "Input file"},
{"out", OPT_OUT, '>', "Output file"}, {"out", OPT_OUT, '>', "Output file"},
{"key", OPT_KEY, '<', "Use the private key contained in file"}, {"key", OPT_KEY, 's', "Private key to use"},
{"keyform", OPT_KEYFORM, 'F', "Key file format"}, {"keyform", OPT_KEYFORM, 'f', "Key file format"},
{"pubkey", OPT_PUBKEY, '-', "Output public key"}, {"pubkey", OPT_PUBKEY, '-', "Output public key"},
{"new", OPT_NEW, '-', "New request"}, {"new", OPT_NEW, '-', "New request"},
{"config", OPT_CONFIG, '<', "Request template file"}, {"config", OPT_CONFIG, '<', "Request template file"},
@ -235,7 +235,7 @@ int req_main(int argc, char **argv)
goto opthelp; goto opthelp;
break; break;
case OPT_ENGINE: case OPT_ENGINE:
(void)setup_engine(opt_arg(), 0); e = setup_engine(opt_arg(), 0);
break; break;
case OPT_KEYGEN_ENGINE: case OPT_KEYGEN_ENGINE:
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
@ -259,7 +259,7 @@ int req_main(int argc, char **argv)
template = opt_arg(); template = opt_arg();
break; break;
case OPT_KEYFORM: case OPT_KEYFORM:
if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &keyform)) if (!opt_format(opt_arg(), OPT_FMT_ANY, &keyform))
goto opthelp; goto opthelp;
break; break;
case OPT_IN: case OPT_IN: