[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  6d1e7709c67fa258527e58b797dc581c4e236f20 (commit)
      from  dab1f5fe4be0ca49b3aa382f0bfdcbf8c8855903 (commit)


- Log -----------------------------------------------------------------
commit 6d1e7709c67fa258527e58b797dc581c4e236f20
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue May 31 13:44:25 2016 -0400

    RT4539: Add section for renamed ciphers.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 doc/apps/ciphers.pod | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
index a8a7c87..19067cd 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/apps/ciphers.pod
@@ -664,6 +664,13 @@ Note: these ciphers can also be used in SSL v3.
  TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256        DHE-PSK-CHACHA20-POLY1305
  TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256        RSA-PSK-CHACHA20-POLY1305
 
+=head2 Older names used by OpenSSL
+
+The following names are accepted by older releases:
+
+ SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA    EDH-RSA-DES-CBC3-SHA (DHE-RSA-DES-CBC3-SHA)
+ SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA    EDH-DSS-DES-CBC3-SHA (DHE-DSS-DES-CBC3-SHA)
+
 =head1 NOTES
 
 Some compiled versions of OpenSSL may not include all the ciphers