diff options
Diffstat (limited to 'crypto/src/bcpg')
| -rw-r--r-- | crypto/src/bcpg/ModDetectionCodePacket.cs | 5 | ||||
| -rw-r--r-- | crypto/src/bcpg/PublicKeyAlgorithmTags.cs | 4 | ||||
| -rw-r--r-- | crypto/src/bcpg/PublicKeyPacket.cs | 2 | ||||
| -rw-r--r-- | crypto/src/bcpg/SignaturePacket.cs | 2 | ||||
| -rw-r--r-- | crypto/src/bcpg/UserAttributePacket.cs | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/crypto/src/bcpg/ModDetectionCodePacket.cs b/crypto/src/bcpg/ModDetectionCodePacket.cs index 6bb23645a..ae8283aef 100644 --- a/crypto/src/bcpg/ModDetectionCodePacket.cs +++ b/crypto/src/bcpg/ModDetectionCodePacket.cs @@ -33,10 +33,9 @@ namespace Org.BouncyCastle.Bcpg return (byte[]) digest.Clone(); } - public override void Encode( - BcpgOutputStream bcpgOut) + public override void Encode(BcpgOutputStream bcpgOut) { - bcpgOut.WritePacket(PacketTag.ModificationDetectionCode, digest, false); + bcpgOut.WritePacket(PacketTag.ModificationDetectionCode, digest); } } } diff --git a/crypto/src/bcpg/PublicKeyAlgorithmTags.cs b/crypto/src/bcpg/PublicKeyAlgorithmTags.cs index 1dd041a5f..a309b65ae 100644 --- a/crypto/src/bcpg/PublicKeyAlgorithmTags.cs +++ b/crypto/src/bcpg/PublicKeyAlgorithmTags.cs @@ -14,7 +14,11 @@ 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) + + // TODO Mark obsolete once Ed25519, Ed448 available + //[Obsolete("Use Ed25519 or Ed448 instead")] EdDsa = 22, // EdDSA - (internet draft, but appearing in use) + EdDsa_Legacy = 22, // new name for old EdDSA tag. Experimental_1 = 100, Experimental_2 = 101, diff --git a/crypto/src/bcpg/PublicKeyPacket.cs b/crypto/src/bcpg/PublicKeyPacket.cs index b3b5d1600..89177ce84 100644 --- a/crypto/src/bcpg/PublicKeyPacket.cs +++ b/crypto/src/bcpg/PublicKeyPacket.cs @@ -50,7 +50,7 @@ namespace Org.BouncyCastle.Bcpg case PublicKeyAlgorithmTag.ECDsa: key = new ECDsaPublicBcpgKey(bcpgIn); break; - case PublicKeyAlgorithmTag.EdDsa: + case PublicKeyAlgorithmTag.EdDsa_Legacy: key = new EdDsaPublicBcpgKey(bcpgIn); break; default: diff --git a/crypto/src/bcpg/SignaturePacket.cs b/crypto/src/bcpg/SignaturePacket.cs index 99ca7df40..305039e1c 100644 --- a/crypto/src/bcpg/SignaturePacket.cs +++ b/crypto/src/bcpg/SignaturePacket.cs @@ -143,7 +143,7 @@ namespace Org.BouncyCastle.Bcpg signature = new MPInteger[3]{ p, g, y }; break; case PublicKeyAlgorithmTag.ECDsa: - case PublicKeyAlgorithmTag.EdDsa: + case PublicKeyAlgorithmTag.EdDsa_Legacy: MPInteger ecR = new MPInteger(bcpgIn); MPInteger ecS = new MPInteger(bcpgIn); signature = new MPInteger[2]{ ecR, ecS }; diff --git a/crypto/src/bcpg/UserAttributePacket.cs b/crypto/src/bcpg/UserAttributePacket.cs index 0be24e006..e976f1215 100644 --- a/crypto/src/bcpg/UserAttributePacket.cs +++ b/crypto/src/bcpg/UserAttributePacket.cs @@ -46,7 +46,7 @@ namespace Org.BouncyCastle.Bcpg subpackets[i].Encode(bOut); } - bcpgOut.WritePacket(PacketTag.UserAttribute, bOut.ToArray(), false); + bcpgOut.WritePacket(PacketTag.UserAttribute, bOut.ToArray()); } } } |