diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-03-20 13:08:37 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-03-20 13:08:37 +0700 |
| commit | ca4ac52697703c8e0613de804b02d6eca2d9cc97 (patch) | |
| tree | 143554e7766186c2c918e6b119ebaf2baf596699 | |
| parent | Register some SM2 sig algs. (diff) | |
| download | BouncyCastle.NET-ed25519-ca4ac52697703c8e0613de804b02d6eca2d9cc97.tar.xz | |
Add tag bounds check to prevent old packet confusion.
| -rw-r--r-- | crypto/src/bcpg/BcpgOutputStream.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crypto/src/bcpg/BcpgOutputStream.cs b/crypto/src/bcpg/BcpgOutputStream.cs index 29ed9e22a..5b53bb28d 100644 --- a/crypto/src/bcpg/BcpgOutputStream.cs +++ b/crypto/src/bcpg/BcpgOutputStream.cs @@ -133,11 +133,7 @@ namespace Org.BouncyCastle.Bcpg } } - private void WriteHeader( - PacketTag tag, - bool oldPackets, - bool partial, - long bodyLen) + private void WriteHeader(PacketTag packetTag, bool oldPackets, bool partial, long bodyLen) { int hdr = 0x80; @@ -147,9 +143,12 @@ namespace Org.BouncyCastle.Bcpg partialBuffer = null; } - if (oldPackets) + int tag = (int)packetTag; + + // only tags <= 0xF in value can be written as old packets. + if (tag <= 0xF && oldPackets) { - hdr |= ((int) tag) << 2; + hdr |= tag << 2; if (partial) { @@ -180,7 +179,7 @@ namespace Org.BouncyCastle.Bcpg } else { - hdr |= 0x40 | (int) tag; + hdr |= 0x40 | tag; this.WriteByte((byte) hdr); if (partial) |