summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael <meeque@users.noreply.github.com>2024-02-09 23:45:00 +0100
committerTomas Mraz <tomas@openssl.org>2024-02-25 11:13:45 +0100
commit6ba200046eca9fac6fac9eec3e6802cd6261766d (patch)
tree9a67d5b16379fa6c1e42741e0ced278bc66960a4
parente8b144343677d643c13750db555df1ac79fd10f2 (diff)
Improve documentation of standard IANA cipher suite names.
Reviewed-by: Paul Yang <kaishen.yy@antfin.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/23539) (cherry picked from commit 2d70cc9cecf8b322d795985efecee06242b203b3)
-rw-r--r--doc/man1/openssl-ciphers.pod.in14
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/man1/openssl-ciphers.pod.in b/doc/man1/openssl-ciphers.pod.in
index d4df30686f..e5aa220d74 100644
--- a/doc/man1/openssl-ciphers.pod.in
+++ b/doc/man1/openssl-ciphers.pod.in
@@ -417,10 +417,13 @@ B<SSL_IDEA>, B<SSL_AES128>, B<SSL_AES256>, B<SSL_CAMELLIA128>, B<SSL_CAMELLIA256
=head1 CIPHER SUITE NAMES
-The following lists give the SSL or TLS cipher suites names from the
-relevant specification and their OpenSSL equivalents. It should be noted,
-that several cipher suite names do not include the authentication used,
-e.g. DES-CBC3-SHA. In these cases, RSA authentication is used.
+The following lists give the standard SSL or TLS cipher suites names from the
+relevant specification and their OpenSSL equivalents. You can use either
+standard names or OpenSSL names in cipher lists, or a mix of both.
+
+It should be noted, that several cipher suite names do not include the
+authentication used, e.g. DES-CBC3-SHA. In these cases, RSA authentication
+is used.
=head2 SSL v3.0 cipher suites
@@ -796,6 +799,9 @@ The B<-stdname> is only available if OpenSSL is built with tracing enabled
The B<-convert> option was added in OpenSSL 1.1.1.
+Support for standard IANA names in cipher lists was added in
+OpenSSL 3.2.0.
+
=head1 COPYRIGHT
Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.