Fix a= tag in ed25519 signatures (thanks to Jeremy Harris)

This commit is contained in:
Scott Kitterman
2018-02-05 11:28:05 -05:00
parent 3138f90077
commit 3209be62d1
5 changed files with 20 additions and 21 deletions
+2 -2
View File
@@ -556,7 +556,7 @@ class DomainSigner(object):
sig2 = RSASSA_PKCS1_v1_5_sign(h, pk)
except DigestTooLargeError:
raise ParameterError("digest too large for modulus")
elif self.signature_algorithm == b'ed25519':
elif self.signature_algorithm == b'ed25519-sha256':
sigobj = pk.sign(h.digest())
sig2 = sigobj.signature
# Folding b= is explicity allowed, but yahoo and live.com are broken
@@ -692,7 +692,7 @@ class DKIM(DomainSigner):
pk = parse_pem_private_key(privkey)
except UnparsableKeyError as e:
raise KeyFormatError(str(e))
elif self.signature_algorithm == b'ed25519':
elif self.signature_algorithm == b'ed25519-sha256':
pk = nacl.signing.SigningKey(privkey, encoder=nacl.encoding.Base64Encoder)
if identity is not None and not identity.endswith(domain):