Remove remnants of the --with-cc-alg option

Commit afa81ee4e4e863fa646177947c55e8c6b1475f47 omitted some spots in
the source tree which are still referencing the removed --with-cc-alg
"configure" option.  Make sure the latter is removed completely.

(cherry picked from commit 428dcf3b49d9c0ddbc1a2239812228172611bd56)

diff --git a/configure b/configure
index 21726f5926570de1dcc5ffb3fc227c8eb2d7c6fd..f8ff2a6ea5a491f7bad7b73bdb27649cc695b937 100755 (executable)
--- a/configure
+++ b/configure
@@ -24314,9 +24314,6 @@ report() {
     test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--with-geoip2)"
     test "no" = "$use_geoip" || echo "    Legacy GeoIP access control (--with-geoip)"
     test "no" = "$use_gssapi" || echo "    GSS-API (--with-gssapi)"
-    if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then
-       echo "        Algorithm: $with_cc_alg"
-    fi
 
     # these lines are only printed if run with --enable-full-report
     if test "yes" = "$enable_full_report"; then

diff --git a/configure.ac b/configure.ac
index dbe8eb6d3b7fd10f48cd5b619737ce816311ef9f..753981c29a4f90906c143de5b9fe1196fa301aef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3152,9 +3152,6 @@ report() {
     test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--with-geoip2)"
     test "no" = "$use_geoip" || echo "    Legacy GeoIP access control (--with-geoip)"
     test "no" = "$use_gssapi" || echo "    GSS-API (--with-gssapi)"
-    if test "yes" = "$enable_full_report" -o "aes" != "$with_cc_alg"; then
-       echo "        Algorithm: $with_cc_alg"
-    fi
 
     # these lines are only printed if run with --enable-full-report
     if test "yes" = "$enable_full_report"; then

diff --git a/win32utils/Configure b/win32utils/Configure
index 109e924d5c3256f8127e68d691876cc8572d81a0..5492310d044dfe1e5d636fa3b9f55fa2c2e6a325 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -367,7 +367,6 @@ my @enablelist = ("developer",
 # with-xxx/without-xxx
 
 my @withlist = ("aes",
-                "cc-alg",
                 "cross-compile",
                 "ecdsa",
                 "eddsa",
@@ -428,7 +427,6 @@ my @help = (
 "  with-openssl[=PATH]   build with OpenSSL yes|path (mandatory)\n",
 "  with-pkcs11[=PATH]    build with PKCS#11 support yes|no|provider-path\n",
 "  with-eddsa            crypto EDDSA yes|all|no\n",
-"  with-cc-alg           choose the algorithm for cookies aes|sha1|sha256\n",
 "  with-gssapi[=PATH]    build with MIT KfW GSSAPI yes|no|path\n",
 "  with-libxml2[=PATH]   build with libxml2 library yes|no|path\n",
 "  with-geoip[=PATH]     build with GeoIP support yes|no|path\n",
@@ -478,7 +476,6 @@ my $pkcs11_path = "unknown";
 my $use_eddsa = "auto";
 my $use_ed448 = "auto";
 my $use_aes = "auto";
-my $cookie_algorithm = "aes";
 my $use_gssapi = "no";
 my $validation_default = "auto";
 my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\";
@@ -772,8 +769,6 @@ sub mywith {
         } elsif ($val =~ /^yes$/i) {
             $use_aes = "yes";
         }
-    } elsif ($key =~ /^cc-alg$/i) {
-        $cookie_algorithm = $val;
     } elsif ($key =~ /^gssapi$/i) {
         if ($val !~ /^no$/i) {
             $use_gssapi = "yes";
@@ -962,7 +957,6 @@ if ($verbose) {
     } else {
         print "querytrace: disabled\n";
     }
-    print "cookie algorithm: $cookie_algorithm\n";
     print "openssl-path: $openssl_path\n";
     if ($use_tests eq "yes") {
         print "tests: enabled\n";
@@ -3020,7 +3014,6 @@ exit 0;
 #  --with-ecdsa supported
 #  --with-eddsa supported
 #  --with-aes supported
-#  --with-cc-alg supported
 #  --with-randomdev not supported on WIN32 (makes no sense)
 #  --with-geoip supported
 #  --with-geoip2 supported