summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Meerwald-Stadler <pmeerw@pmeerw.net>2018-01-31 10:16:51 +1000
committerPauli <paul.dale@oracle.com>2018-01-31 10:16:51 +1000
commit85d6ad34aa0158fb25538e116e611e6b858d3638 (patch)
treee251783451e809b2e2d3966fc7623599abd380c9
parent9be64336d899bac38fd4a4423df01d44fff5f2eb (diff)
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)
-rwxr-xr-xConfigure2
-rw-r--r--INSTALL10
2 files changed, 6 insertions, 6 deletions
diff --git a/Configure b/Configure
index 737dfc78ba..cad25bbe60 100755
--- a/Configure
+++ b/Configure
@@ -2506,7 +2506,7 @@ Print a brief help message 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>
B<--options> B<--environment> B<--make-variables> B<--build-parameters>.
diff --git a/INSTALL b/INSTALL
index 01b8056dd0..48c25e6519 100644
--- a/INSTALL
+++ b/INSTALL
@@ -510,11 +510,11 @@
no-<alg>
Build without support for the specified algorithm, where
- <alg> is one of: bf, blake2, camellia, cast, chacha, cmac,
- des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb, poly1305,
- rc2, rc4, rmd160, scrypt, seed, siphash, sm3, sm4 or
- whirlpool. The "ripemd" algorithm is deprecated and if used
- is synonymous with rmd160.
+ <alg> is one of: aria, bf, blake2, camellia, cast, chacha,
+ cmac, des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb,
+ poly1305, rc2, rc4, rmd160, scrypt, seed, siphash, sm3, sm4
+ or whirlpool. The "ripemd" algorithm is deprecated and if
+ used is synonymous with rmd160.
-Dxxx, -Ixxx, -Wp, -lxxx, -Lxxx, -Wl, -rpath, -R, -framework, -static
These system specific options will be recognised and