Skip to content

Commit

Permalink
Improve documentation of standard IANA cipher suite names.
Browse files Browse the repository at this point in the history
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #23539)

(cherry picked from commit 2d70cc9)
  • Loading branch information
meeque authored and t8m committed Feb 25, 2024
1 parent e8b1443 commit 6ba2000
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions doc/man1/openssl-ciphers.pod.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 6ba2000

Please sign in to comment.