3 files changed, 3 insertions, 0 deletions
diff --git a/crypto/Readme.html b/crypto/Readme.html
index 5ad32246c..a6b1ca7e5 100644
--- a/crypto/Readme.html
+++ b/crypto/Readme.html
@@ -307,6 +307,7 @@ We state, where EC MQV has not otherwise been disabled or removed:
<h5>Defects Fixed</h5>
<ul>
<li>ChaCha20Poly1305 could fail for large (>~2GB) files. This has been fixed.</li>
+ <li>EdDSA verifiers now reset correctly after rejecting overly long signatures.</li>
<li>DTLS: Fixed infinite loop on IO exceptions.</li>
</ul>
<h5>Additional Features and Functionality</h5>
diff --git a/crypto/src/bcpg/PublicKeyAlgorithmTags.cs b/crypto/src/bcpg/PublicKeyAlgorithmTags.cs
index 9e30b54f7..7c93964f2 100644
--- a/crypto/src/bcpg/PublicKeyAlgorithmTags.cs
+++ b/crypto/src/bcpg/PublicKeyAlgorithmTags.cs
@@ -16,6 +16,7 @@ namespace Org.BouncyCastle.Bcpg
ECDsa = 19, // Reserved for ECDSA
ElGamalGeneral = 20, // Elgamal (Encrypt or Sign)
DiffieHellman = 21, // Reserved for Diffie-Hellman (X9.42, as defined for IETF-S/MIME)
+ EdDsa = 22, // EdDSA - (internet draft, but appearing in use)
Experimental_1 = 100,
Experimental_2 = 101,
diff --git a/crypto/src/openpgp/PgpSecretKey.cs b/crypto/src/openpgp/PgpSecretKey.cs
index 01cceadbb..a3ffd4a4a 100644
--- a/crypto/src/openpgp/PgpSecretKey.cs
+++ b/crypto/src/openpgp/PgpSecretKey.cs
@@ -423,6 +423,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp
case PublicKeyAlgorithmTag.RsaSign:
case PublicKeyAlgorithmTag.Dsa:
case PublicKeyAlgorithmTag.ECDsa:
+ case PublicKeyAlgorithmTag.EdDsa:
case PublicKeyAlgorithmTag.ElGamalGeneral:
return true;
default:
|
