[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  d0c278ee3fd1b111504552197a6a1416e924a2c8 (commit)
      from  5961b15235cc5598c7ec2001aec802ac6724ff18 (commit)


- Log -----------------------------------------------------------------
commit d0c278ee3fd1b111504552197a6a1416e924a2c8
Author: Adrian Vollmer <adrian.vollmer at syss.de>
Date:   Mon Feb 27 15:51:21 2017 +0100

    Adjust the default value of the private key size
    
    ...in the man page to reflect the actual default (2048 instead of 512)
    
    CLA: trivial
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2754)
    
    (cherry picked from commit 013bc448672cbc3c9cd154709400c676c2955229)

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

Summary of changes:
 doc/apps/genrsa.pod | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/apps/genrsa.pod b/doc/apps/genrsa.pod
index 38e83f7..f4ed959 100644
--- a/doc/apps/genrsa.pod
+++ b/doc/apps/genrsa.pod
@@ -13,6 +13,9 @@ B<openssl> B<genrsa>
 [B<-aes128>]
 [B<-aes192>]
 [B<-aes256>]
+[B<-aria128>]
+[B<-aria192>]
+[B<-aria256>]
 [B<-camellia128>]
 [B<-camellia192>]
 [B<-camellia256>]
@@ -47,7 +50,7 @@ standard output is used.
 the output file password source. For more information about the format of B<arg>
 see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)>.
 
-=item B<-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea>
+=item B<-aes128|-aes192|-aes256|-aria128|-aria192|-aria256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea>
 
 These options encrypt the private key with specified
 cipher before outputting it. If none of these options is
@@ -76,7 +79,7 @@ for all available algorithms.
 =item B<numbits>
 
 the size of the private key to generate in bits. This must be the last option
-specified. The default is 512.
+specified. The default is 2048.
 
 =back
 
@@ -105,7 +108,7 @@ L<gendsa(1)>
 
 =head1 COPYRIGHT
 
-Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
 
 Licensed under the OpenSSL license (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy