aboutsummaryrefslogtreecommitdiff
path: root/openssl/doc/apps/rsa.pod
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-09-02 18:24:12 +0200
committerMike DePaulo <mikedep333@gmail.com>2015-02-28 07:15:53 -0500
commit8fafe3481b134a4d368ba57e3698754a6a45c4c1 (patch)
treeb617e841e1b5c0b234f7698331e5fb1be1c2332a /openssl/doc/apps/rsa.pod
parentfe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff)
downloadvcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.gz
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.bz2
vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.zip
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/doc/apps/rsa.pod')
-rw-r--r--openssl/doc/apps/rsa.pod12
1 files changed, 9 insertions, 3 deletions
diff --git a/openssl/doc/apps/rsa.pod b/openssl/doc/apps/rsa.pod
index d7d784d52..21cbf8ee0 100644
--- a/openssl/doc/apps/rsa.pod
+++ b/openssl/doc/apps/rsa.pod
@@ -15,6 +15,12 @@ B<openssl> B<rsa>
[B<-out filename>]
[B<-passout arg>]
[B<-sgckey>]
+[B<-aes128>]
+[B<-aes192>]
+[B<-aes256>]
+[B<-camellia128>]
+[B<-camellia192>]
+[B<-camellia256>]
[B<-des>]
[B<-des3>]
[B<-idea>]
@@ -82,10 +88,10 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
use the modified NET algorithm used with some versions of Microsoft IIS and SGC
keys.
-=item B<-des|-des3|-idea>
+=item B<-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea>
-These options encrypt the private key with the DES, triple DES, or the
-IDEA ciphers respectively before outputting it. A pass phrase is prompted for.
+These options encrypt the private key with the specified
+cipher before outputting it. A pass phrase is prompted for.
If none of these options is specified the key is written in plain text. This
means that using the B<rsa> utility to read in an encrypted key with no
encryption option can be used to remove the pass phrase from a key, or by