From: Mark Andrews <marka@isc.org>
Date: Mon, 27 Jun 2016 02:11:37 +0000 (+1000)
Subject: 4399.   [bug]           policy.py 'ECCGOST', 'ECDSAP256SHA256', and
X-Git-Tag: v9.11.0b1~9
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8d49a1a0d1658952181cc686fc4dc62006baa1a7;p=thirdparty%2Fbind9.git

4399.   [bug]           policy.py 'ECCGOST', 'ECDSAP256SHA256', and
                        'ECDSAP384SHA384' don't have settable keysize.
                        [RT #42718]
---

diff --git a/CHANGES b/CHANGES
index 1ee00ecf24f..f73ecbf4e64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4399.	[bug] 		policy.py 'ECCGOST', 'ECDSAP256SHA256', and
+			'ECDSAP384SHA384' don't have settable keysize.
+			[RT #42718]
+
 4398.	[bug]		Correct spelling of ECDSAP256SHA256 in policy.py.
 			[RT #42718]
 
diff --git a/bin/python/isc/policy.py.in b/bin/python/isc/policy.py.in
index 6e739e82e64..99e820a75e8 100644
--- a/bin/python/isc/policy.py.in
+++ b/bin/python/isc/policy.py.in
@@ -281,6 +281,12 @@ class Policy:
                         ('ZSK key size %d not divisible by 64 ' +
                          'as required for DSA') % self.zsk_keysize
 
+            if self.algorithm in ['ECCGOST', \
+                                  'ECDSAP256SHA256', \
+                                  'ECDSAP384SHA384']:
+                self.ksk_keysize = None
+                self.zsk_keysize = None
+
         return True, ''
 
 ############################################################################
@@ -371,10 +377,14 @@ class dnssec_policy:
         self.alg_policy['ECDSAP256SHA256'] = copy(p)
         self.alg_policy['ECDSAP256SHA256'].algorithm = "ECDSAP256SHA256"
         self.alg_policy['ECDSAP256SHA256'].name = "ECDSAP256SHA256"
+        self.alg_policy['ECDSAP256SHA256'].ksk_keysize = None;
+        self.alg_policy['ECDSAP256SHA256'].zsk_keysize = None;
 
         self.alg_policy['ECDSAP384SHA384'] = copy(p)
         self.alg_policy['ECDSAP384SHA384'].algorithm = "ECDSAP384SHA384"
         self.alg_policy['ECDSAP384SHA384'].name = "ECDSAP384SHA384"
+        self.alg_policy['ECDSAP384SHA384'].ksk_keysize = None;
+        self.alg_policy['ECDSAP384SHA384'].zsk_keysize = None;
 
         if filename:
             self.load(filename)