From 04168ae281bfbd714ddf6b90d98eac892508dde8 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 2 Sep 2014 18:24:12 +0200
Subject: Upgrade openssl to version openssl-1.0.1i

---
 openssl/doc/apps/rsa.pod | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'openssl/doc/apps/rsa.pod')

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
-- 
cgit v1.2.3