From 97e13cc244a1fc67fd42c421c92ccead5e38a2f5 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 27 Jun 2016 09:36:10 +1000 Subject: [PATCH] 4398. [bug] Correct spelling of ECDSAP256SHA256 in policy.py. [RT #42718] --- CHANGES | 3 +++ bin/python/isc/policy.py.in | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 38f140022f..1ee00ecf24 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 2f90383890..6e739e82e6 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"