From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 25 Oct 2018 08:30:07 +0000 (+0200)
Subject: Remove traces of DST_ALG_ECC which is now just Reserved in IANA registry
X-Git-Tag: v9.13.4~82^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbb08b30b8ae730fbe163cb95a51bb49970e08d3;p=thirdparty%2Fbind9.git

Remove traces of DST_ALG_ECC which is now just Reserved in IANA registry
---

diff --git a/bin/python/isc/dnskey.py.in b/bin/python/isc/dnskey.py.in
index 8c5a80f7c1b..eaedb80d999 100644
--- a/bin/python/isc/dnskey.py.in
+++ b/bin/python/isc/dnskey.py.in
@@ -30,7 +30,7 @@ class dnskey:
               'Revoke', 'DSPublish', 'SyncPublish', 'SyncDelete')
     _OPTS = (None, '-P', '-A', '-I', '-D', '-R', None, '-Psync', '-Dsync')
 
-    _ALGNAMES = (None, 'RSAMD5', 'DH', 'DSA', 'ECC', 'RSASHA1',
+    _ALGNAMES = (None, 'RSAMD5', 'DH', 'DSA', None, 'RSASHA1',
                  'NSEC3DSA', 'NSEC3RSASHA1', 'RSASHA256', None,
                  'RSASHA512', None, 'ECCGOST', 'ECDSAP256SHA256',
                  'ECDSAP384SHA384', 'ED25519', 'ED448')
diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index 5c6ff442ab3..6a29f1cdb83 100644
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -275,8 +275,7 @@ dns_nsec_nseconly(dns_db_t *db, dns_dbversion_t *version,
 
 		if (dnskey.algorithm == DST_ALG_RSAMD5 ||
 		    dnskey.algorithm == DST_ALG_RSASHA1 ||
-		    dnskey.algorithm == DST_ALG_DSA ||
-		    dnskey.algorithm == DST_ALG_ECC)
+		    dnskey.algorithm == DST_ALG_DSA)
 			break;
 	}
 	dns_rdataset_disassociate(&rdataset);
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index 41fc88e893a..276b68cef36 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -108,7 +108,6 @@
 	{ DNS_KEYALG_RSAMD5, "RSAMD5", 0 }, \
 	{ DNS_KEYALG_RSAMD5, "RSA", 0 }, \
 	{ DNS_KEYALG_DH, "DH", 0 }, \
-	{ DNS_KEYALG_ECC, "ECC", 0 }, \
 	{ DNS_KEYALG_RSASHA1, "RSASHA1", 0 }, \
 	{ DNS_KEYALG_NSEC3RSASHA1, "NSEC3RSASHA1", 0 }, \
 	{ DNS_KEYALG_RSASHA256, "RSASHA256", 0 }, \
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index e4f1d3f4e3c..f2ba31cb9a7 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -17862,7 +17862,7 @@ dnskey_sane(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 
 		alg = tuple->rdata.data[3];
 		if (alg == DST_ALG_RSAMD5 || alg == DST_ALG_RSASHA1 ||
-		    alg == DST_ALG_DSA || alg == DST_ALG_ECC) {
+		    alg == DST_ALG_DSA) {
 			nseconly = true;
 			break;
 		}
diff --git a/lib/ns/update.c b/lib/ns/update.c
index c1d3e70b7b5..d5b218b1786 100644
--- a/lib/ns/update.c
+++ b/lib/ns/update.c
@@ -1961,7 +1961,7 @@ check_dnssec(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
 			uint8_t alg;
 			alg = tuple->rdata.data[3];
 			if (alg == DST_ALG_RSAMD5 || alg == DST_ALG_RSASHA1 ||
-			    alg == DST_ALG_DSA || alg == DST_ALG_ECC) {
+			    alg == DST_ALG_DSA) {
 				nseconly = true;
 				break;
 			}