[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f20bb4eb18b01979cb23b2ae4a60675c83c4ba91 (commit)
      from  3f131556d6678bc3754f1e6d98a9a5bfc24e368c (commit)


- Log -----------------------------------------------------------------
commit f20bb4eb18b01979cb23b2ae4a60675c83c4ba91
Author: Jeffrey Walton <noloader at gmail.com>
Date:   Wed May 13 15:27:57 2015 -0400

    RT3472: Doc pkcs8 -iter flag is in OpenSSL 1.1
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/apps/pkcs8.pod | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/apps/pkcs8.pod b/doc/apps/pkcs8.pod
index 44c27f1..433e55c 100644
--- a/doc/apps/pkcs8.pod
+++ b/doc/apps/pkcs8.pod
@@ -83,9 +83,9 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
 
 =item B<-iter count>
 
-When creating new PKCS#8 containers, use a given number of iterations on the password
-in deriving the encryption key for the PKCS#8 output. High values increase the time
-required to brute-force a PKCS#8 container.
+When creating new PKCS#8 containers, use a given number of iterations on
+the password in deriving the encryption key for the PKCS#8 output.
+High values increase the time required to brute-force a PKCS#8 container.
 
 =item B<-nocrypt>
 
@@ -279,4 +279,8 @@ the old format at present.
 L<dsa(1)|dsa(1)>, L<rsa(1)|rsa(1)>, L<genrsa(1)|genrsa(1)>,
 L<gendsa(1)|gendsa(1)> 
 
+=head1 HISTORY
+
+The B<-iter> option was added to OpenSSL 1.1.0.
+
 =cut