From: Michał Kępień <michal@isc.org>
Date: Tue, 15 Oct 2019 19:57:58 +0000 (+0200)
Subject: Remove remnants of the --with-cc-alg option
X-Git-Tag: v9.15.6~58^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=428dcf3b49d9c0ddbc1a2239812228172611bd56;p=thirdparty%2Fbind9.git

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.
---

diff --git a/configure b/configure
index 899e0536c7c..767c7c2d12e 100755
--- a/configure
+++ b/configure
@@ -25647,9 +25647,6 @@ report() {
 	    echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
     test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--enable-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 e626585aee6..17b09511b72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2883,9 +2883,6 @@ report() {
 	    echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
     test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--enable-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 efed78918b0..cd97fd760e6 100644
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -361,7 +361,6 @@ my @enablelist = ("developer",
 # with-xxx/without-xxx
 
 my @withlist = ("aes",
-                "cc-alg",
                 "cross-compile",
                 "ecdsa",
                 "eddsa",
@@ -421,7 +420,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-geoip2[=PATH]    build with GeoIP2 support yes|no|path\n",
@@ -470,7 +468,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\\";
@@ -762,8 +759,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";
@@ -942,7 +937,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";
@@ -2838,7 +2832,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-geoip2 supported
 #  --with-gssapi supported with MIT (K)erberos (f)or (W)indows