提交 9aba5c5f 编写于 作者: B Bastian Germann 提交者: Richard Levitte

apps x509: passing PKCS#11 URL as -signkey

OpenSSL 1.1.0 has extended option checking, and rejects passing a PKCS#11
engine URL to "-signkey" option. The actual code is ready to take it.

Change the option parsing to allow an engine URL to be passed and modify
the manpage accordingly.

CLA: trivial

(cherry picked from commit 16d560439d8b1be5082228a87576a8f79b3525ac)
Reviewed-by: NShane Lontis <shane.lontis@oracle.com>
Reviewed-by: NTomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11173)
上级 4eca3ec7
...@@ -107,7 +107,7 @@ const OPTIONS x509_options[] = { ...@@ -107,7 +107,7 @@ const OPTIONS x509_options[] = {
{"checkend", OPT_CHECKEND, 'M', {"checkend", OPT_CHECKEND, 'M',
"Check whether the cert expires in the next arg seconds"}, "Check whether the cert expires in the next arg seconds"},
{OPT_MORE_STR, 1, 1, "Exit 1 if so, 0 if not"}, {OPT_MORE_STR, 1, 1, "Exit 1 if so, 0 if not"},
{"signkey", OPT_SIGNKEY, '<', "Self sign cert with arg"}, {"signkey", OPT_SIGNKEY, 's', "Self sign cert with arg"},
{"x509toreq", OPT_X509TOREQ, '-', {"x509toreq", OPT_X509TOREQ, '-',
"Output a certification request object"}, "Output a certification request object"},
{"req", OPT_REQ, '-', "Input is a certificate request, sign and output"}, {"req", OPT_REQ, '-', "Input is a certificate request, sign and output"},
......
...@@ -44,7 +44,7 @@ B<openssl> B<x509> ...@@ -44,7 +44,7 @@ B<openssl> B<x509>
[B<-setalias arg>] [B<-setalias arg>]
[B<-days arg>] [B<-days arg>]
[B<-set_serial n>] [B<-set_serial n>]
[B<-signkey filename>] [B<-signkey arg>]
[B<-passin arg>] [B<-passin arg>]
[B<-x509toreq>] [B<-x509toreq>]
[B<-req>] [B<-req>]
...@@ -350,10 +350,11 @@ can thus behave like a "mini CA". ...@@ -350,10 +350,11 @@ can thus behave like a "mini CA".
=over 4 =over 4
=item B<-signkey filename> =item B<-signkey arg>
This option causes the input file to be self signed using the supplied This option causes the input file to be self signed using the supplied
private key. private key or engine. The private key's format is specified with the
B<-keyform> option.
If the input file is a certificate it sets the issuer name to the If the input file is a certificate it sets the issuer name to the
subject name (i.e. makes it self signed) changes the public key to the subject name (i.e. makes it self signed) changes the public key to the
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册