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

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  cc92ac759c5a8c7303f29a24327404f7804350b2 (commit)
      from  6c34c5f30bf528237cb15ed634dc338412b51a76 (commit)


- Log -----------------------------------------------------------------
commit cc92ac759c5a8c7303f29a24327404f7804350b2
Author: Pauli <paul.dale at oracle.com>
Date:   Thu Mar 2 12:52:44 2017 +1000

    Update the cipher(1) documentation to
    
    explicitly state that the RSA cipher
    string means the same a kRSA.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2821)
    (cherry picked from commit f2bcff43bcd5b1e2632273ef8fea0900a15d7769)

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

Summary of changes:
 doc/apps/ciphers.pod | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/apps/ciphers.pod b/doc/apps/ciphers.pod
index c1d1cb2..e0ab291 100644
--- a/doc/apps/ciphers.pod
+++ b/doc/apps/ciphers.pod
@@ -219,7 +219,8 @@ When in doubt, include B<!aNULL> in your cipherlist.
 
 =item B<kRSA>, B<aRSA>, B<RSA>
 
-Cipher suites using RSA key exchange, authentication or either respectively.
+Cipher suites using RSA key exchange or authentication. B<RSA> is an alias for
+B<kRSA>.
 
 =item B<kDHr>, B<kDHd>, B<kDH>