Configure: Fix configdata.pm shorthand for --dump, should be -d

INSTALL: Mention 'aria' algorithm for no-<alg>

Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/5215)
This commit is contained in:
Peter Meerwald-Stadler 2018-01-31 10:16:51 +10:00 committed by Pauli
parent 9be64336d8
commit 85d6ad34aa
2 changed files with 6 additions and 6 deletions

View file

@ -2506,7 +2506,7 @@ Print a brief help message and exit.
Print the manual page and exit. Print the manual page and exit.
=item B<--dump> | B<-c> =item B<--dump> | B<-d>
Print all relevant configuration data. This is equivalent to B<--command-line> Print all relevant configuration data. This is equivalent to B<--command-line>
B<--options> B<--environment> B<--make-variables> B<--build-parameters>. B<--options> B<--environment> B<--make-variables> B<--build-parameters>.

10
INSTALL
View file

@ -510,11 +510,11 @@
no-<alg> no-<alg>
Build without support for the specified algorithm, where Build without support for the specified algorithm, where
<alg> is one of: bf, blake2, camellia, cast, chacha, cmac, <alg> is one of: aria, bf, blake2, camellia, cast, chacha,
des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb, poly1305, cmac, des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb,
rc2, rc4, rmd160, scrypt, seed, siphash, sm3, sm4 or poly1305, rc2, rc4, rmd160, scrypt, seed, siphash, sm3, sm4
whirlpool. The "ripemd" algorithm is deprecated and if used or whirlpool. The "ripemd" algorithm is deprecated and if
is synonymous with rmd160. used is synonymous with rmd160.
-Dxxx, -Ixxx, -Wp, -lxxx, -Lxxx, -Wl, -rpath, -R, -framework, -static -Dxxx, -Ixxx, -Wp, -lxxx, -Lxxx, -Wl, -rpath, -R, -framework, -static
These system specific options will be recognised and These system specific options will be recognised and