From: Mark Andrews <marka@isc.org>
Date: Sun, 26 Jun 2016 23:36:10 +0000 (+1000)
Subject: 4398.   [bug]           Correct spelling of ECDSAP256SHA256 in policy.py.
X-Git-Tag: v9.11.0b1~10
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=97e13cc244a1fc67fd42c421c92ccead5e38a2f5;p=thirdparty%2Fbind9.git

4398.   [bug]           Correct spelling of ECDSAP256SHA256 in policy.py.
                        [RT #42718]
---

diff --git a/CHANGES b/CHANGES
index 38f140022f6..1ee00ecf24f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4398.	[bug]		Correct spelling of ECDSAP256SHA256 in policy.py.
+			[RT #42718]
+
 4397.	[bug]		Update Windows python support. [RT #42538]
 
 4396.	[func]		dnssec-keymgr now takes a '-r randomfile' option.
diff --git a/bin/python/isc/policy.py.in b/bin/python/isc/policy.py.in
index 2f903838905..6e739e82e64 100644
--- a/bin/python/isc/policy.py.in
+++ b/bin/python/isc/policy.py.in
@@ -76,7 +76,7 @@ class PolicyLex:
         return t
 
     def t_ALGNAME(self, t):
-        r'(?i)\b(RSAMD5|DH|DSA|NSEC3DSA|ECC|RSASHA1|NSEC3RSASHA1|RSASHA256|RSASHA512|ECCGOST|ECDSAP256SHA245|ECDSAP384SHA384)\b'
+        r'(?i)\b(RSAMD5|DH|DSA|NSEC3DSA|ECC|RSASHA1|NSEC3RSASHA1|RSASHA256|RSASHA512|ECCGOST|ECDSAP256SHA256|ECDSAP384SHA384)\b'
         t.value = t.value.upper()
         return t
 
@@ -145,7 +145,7 @@ class Policy:
                              'RSASHA256': [512, 4096],
                              'RSASHA512': [512, 4096],
                              'ECCGOST': None,
-                             'ECDSAP256SHA245': None,
+                             'ECDSAP256SHA256': None,
                              'ECDSAP384SHA384': None}
 
     def __init__(self, name=None, algorithm=None, parent=None):
@@ -368,9 +368,9 @@ class dnssec_policy:
         self.alg_policy['ECCGOST'].algorithm = "ECCGOST"
         self.alg_policy['ECCGOST'].name = "ECCGOST"
 
-        self.alg_policy['ECDSAP256SHA245'] = copy(p)
-        self.alg_policy['ECDSAP256SHA245'].algorithm = "ECDSAP256SHA256"
-        self.alg_policy['ECDSAP256SHA245'].name = "ECDSAP256SHA256"
+        self.alg_policy['ECDSAP256SHA256'] = copy(p)
+        self.alg_policy['ECDSAP256SHA256'].algorithm = "ECDSAP256SHA256"
+        self.alg_policy['ECDSAP256SHA256'].name = "ECDSAP256SHA256"
 
         self.alg_policy['ECDSAP384SHA384'] = copy(p)
         self.alg_policy['ECDSAP384SHA384'].algorithm = "ECDSAP384SHA384"