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)

diff --git a/Configure b/Configure
index 737dfc78ba04cb858c6fe8c4126f0dd75b330df5..cad25bbe607d913c38347e5b852c84805c8d807a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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>
 B<--options> B<--environment> B<--make-variables> B<--build-parameters>.
 
 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 01b8056dd060e135fed8778ff6ccd9cc58955b46..48c25e6519134351450b0c3f551b065db7e161f3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -510,11 +510,11 @@
 
   no-<alg>
                    Build without support for the specified algorithm, where
 
   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
 
   -Dxxx, -Ixxx, -Wp, -lxxx, -Lxxx, -Wl, -rpath, -R, -framework, -static
                    These system specific options will be recognised and