summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2016-02-02 00:37:41 -0500
committerViktor Dukhovni <openssl-users@dukhovni.org>2016-02-02 23:24:12 -0500
commit0c20802c6a6008b28bfb0eac67d69f536edc60a7 (patch)
tree4791be792befcf693011fd98dfd0ec6bd54b9c16 /doc
parent43d6702de97d2d5b5b825ffea772b9f55635688c (diff)
Fix pkeyutl/rsautl empty encrypt-input/decrypt-output handling
Also fix option processing in pkeyutl to allow use of (formerly) "out-of-order" switches that were needless implementation limitations. Handle documented "ENGINE" form with -keyform and -peerform. Better handling of OPENSSL_NO_ENGINE and OPENSSL_NO_RSA. RT2018 Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/apps/pkeyutl.pod8
-rw-r--r--doc/apps/rsautl.pod5
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/apps/pkeyutl.pod b/doc/apps/pkeyutl.pod
index 3c29b3a67c..d44f73aeec 100644
--- a/doc/apps/pkeyutl.pod
+++ b/doc/apps/pkeyutl.pod
@@ -11,10 +11,10 @@ B<openssl> B<pkeyutl>
[B<-out file>]
[B<-sigfile file>]
[B<-inkey file>]
-[B<-keyform PEM|DER>]
+[B<-keyform PEM|DER|ENGINE>]
[B<-passin arg>]
[B<-peerkey file>]
-[B<-peerform PEM|DER>]
+[B<-peerform PEM|DER|ENGINE>]
[B<-pubin>]
[B<-certin>]
[B<-rev>]
@@ -52,7 +52,7 @@ default.
the input key file, by default it should be a private key.
-=item B<-keyform PEM|DER>
+=item B<-keyform PEM|DER|ENGINE>
the key format PEM, DER or ENGINE.
@@ -66,7 +66,7 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
the peer key file, used by key derivation (agreement) operations.
-=item B<-peerform PEM|DER>
+=item B<-peerform PEM|DER|ENGINE>
the peer key format PEM, DER or ENGINE.
diff --git a/doc/apps/rsautl.pod b/doc/apps/rsautl.pod
index 6b98b51864..92b8150cee 100644
--- a/doc/apps/rsautl.pod
+++ b/doc/apps/rsautl.pod
@@ -10,6 +10,7 @@ B<openssl> B<rsautl>
[B<-in file>]
[B<-out file>]
[B<-inkey file>]
+[B<-keyform PEM|DER|ENGINE>]
[B<-pubin>]
[B<-certin>]
[B<-sign>]
@@ -45,6 +46,10 @@ default.
the input key file, by default it should be an RSA private key.
+=item B<-keyform PEM|DER|ENGINE>
+
+the key format PEM, DER or ENGINE.
+
=item B<-pubin>
the input file is an RSA public key.