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 ed002e0ec0dfd838815f5632f06145266cd3cb91..14f0dbc4353847ccb259f99a74d818f4c55abf0c 100755 (executable)
--- a/configure
+++ b/configure
@@ -27634,9 +27634,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 680e1b3df6503bcb1e96e1d7d3b02e02412164b2..3c050ca4acf06c934deff05a1b7bbc057680a0ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5511,9 +5511,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 ccaf0674ad5641c5d9a5f3c6b9bfa3d19362ba04..953f2aa190f0d7e1e1ddf67f8d7ffc020c7d6350 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -531,7 +531,6 @@ my @enablelist = ("developer",
 # with-xxx/without-xxx
 
 my @withlist = ("aes",
-                "cc-alg",
                 "cross-compile",
                 "ecdsa",
                 "eddsa",
@@ -600,7 +599,6 @@ my @help = (
 "  with-eddsa            crypto EDDSA yes|all|no\n",
 "  with-gost[=ENC]       crypto GOST yes|no|raw|ans1\n",
 "  with-aes              crypto AES\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",
@@ -653,7 +651,6 @@ my $use_ed448 = "auto";
 my $use_gost = "auto";
 my $gost_encoding = "raw";
 my $use_aes = "auto";
-my $cookie_algorithm = "aes";
 my $use_gssapi = "no";
 my $gssapi_path = "C:\\Program\ Files\\MIT\\Kerberos\\";
 my $use_geoip = "no";
@@ -976,8 +973,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";
@@ -1198,7 +1193,6 @@ if ($verbose) {
     } else {
         print "rpz-nsdname: disabled\n";
     }
-    print "cookie algorithm: $cookie_algorithm\n";
     if ($use_openssl eq "no") {
         print "openssl: disabled\n";
     } else {
@@ -3695,7 +3689,6 @@ exit 0;
 #  --with-eddsa supported
 #  --with-gost supported
 #  --with-aes supported
-#  --with-cc-alg supported
 #  --with-geoip supported
 #  --with-geoip2 supported
 #  --with-gssapi supported with MIT (K)erberos (f)or (W)indows