From c190506cd827221a861c3207ae2496ea1ec7a1fd Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Wed, 21 Feb 2018 16:49:33 +0100 Subject: [PATCH] Reflect special `DEFAULT` behavior in ciphers(1) Actual behavior of DEFAULT is different than currently described. Rather than actinf as cipher string, DEFAULT cannot be combined using logical operators, etc. Fixes #5420. Reviewed-by: Rich Salz Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/5428) --- doc/man1/ciphers.pod | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/man1/ciphers.pod b/doc/man1/ciphers.pod index 9616e8ed41..3786e9a028 100644 --- a/doc/man1/ciphers.pod +++ b/doc/man1/ciphers.pod @@ -168,19 +168,20 @@ The cipher string B<@SECLEVEL=n> can be used at any point to set the security level to B, which should be a number between zero and five, inclusive. See L for a description of what each level means. +The cipher list can be prefixed with the B keyword, which enables +the default cipher list as defined below. Unlike cipher strings, +this prefix may not be combined with other strings using B<+> character. +For example, B is not valid. + +The content of the default list is determined at compile time and normally +corresponds to B. + =head1 CIPHER STRINGS The following is a list of all permitted cipher strings and their meanings. =over 4 -=item B - -The default cipher list. -This is determined at compile time and is normally -B. -When used, this must be the first cipherstring specified. - =item B The ciphers included in B, but not enabled by default. Currently -- 2.34.1