[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f2bcff43bcd5b1e2632273ef8fea0900a15d7769 (commit)
      from  332dc4fa5e4d7c0d94c4b68576f3872fd465ba8a (commit)


- Log -----------------------------------------------------------------
commit f2bcff43bcd5b1e2632273ef8fea0900a15d7769
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)

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

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

diff --git a/doc/man1/ciphers.pod b/doc/man1/ciphers.pod
index ecd5f95..6fea824 100644
--- a/doc/man1/ciphers.pod
+++ b/doc/man1/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>