[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  9446daac5b7be3210e9c5d80c3d95309d946ee38 (commit)
      from  600fdc716f795674df68b487ab6e7b31165be4a0 (commit)


- Log -----------------------------------------------------------------
commit 9446daac5b7be3210e9c5d80c3d95309d946ee38
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Sat Nov 28 14:45:43 2015 -0500

    Correct aes-128-cbc cipher name
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 doc/apps/cms.pod   | 2 +-
 doc/apps/smime.pod | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/apps/cms.pod b/doc/apps/cms.pod
index cb7fc59..074765a 100644
--- a/doc/apps/cms.pod
+++ b/doc/apps/cms.pod
@@ -292,7 +292,7 @@ default digest algorithm for the signing key will be used (usually SHA1).
 the encryption algorithm to use. For example triple DES (168 bits) - B<-des3>
 or 256 bit AES - B<-aes256>. Any standard algorithm name (as used by the
 EVP_get_cipherbyname() function) can also be used preceded by a dash, for 
-example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for a list of ciphers
+example B<-aes-128-cbc>. See L<B<enc>|enc(1)> for a list of ciphers
 supported by your version of OpenSSL.
 
 If not specified triple DES is used. Only used with B<-encrypt> and 
diff --git a/doc/apps/smime.pod b/doc/apps/smime.pod
index d6f3de2..c9d3601 100644
--- a/doc/apps/smime.pod
+++ b/doc/apps/smime.pod
@@ -195,7 +195,7 @@ default digest algorithm for the signing key will be used (usually SHA1).
 the encryption algorithm to use. For example DES  (56 bits) - B<-des>,
 triple DES (168 bits) - B<-des3>,
 EVP_get_cipherbyname() function) can also be used preceded by a dash, for 
-example B<-aes_128_cbc>. See L<B<enc>|enc(1)> for list of ciphers
+example B<-aes-128-cbc>. See L<B<enc>|enc(1)> for list of ciphers
 supported by your version of OpenSSL.
 
 If not specified triple DES is used. Only used with B<-encrypt>.