diff options
author | David Hook <david.hook@keyfactor.com> | 2022-11-07 17:30:00 +1100 |
---|---|---|
committer | David Hook <david.hook@keyfactor.com> | 2022-11-07 17:30:00 +1100 |
commit | 146be77300207031b6b9477b8e48428278e841b8 (patch) | |
tree | d7342aad04bca424b56229d1d5eba558bbb4afd3 /crypto/src/openpgp/PgpObjectFactory.cs | |
parent | resolve conflicts (diff) | |
parent | GOST 2012 private key reading (diff) | |
download | BouncyCastle.NET-ed25519-146be77300207031b6b9477b8e48428278e841b8.tar.xz |
Merge branch 'master' of gitlab.cryptoworkshop.com:root/bc-csharp
Diffstat (limited to 'crypto/src/openpgp/PgpObjectFactory.cs')
-rw-r--r-- | crypto/src/openpgp/PgpObjectFactory.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/src/openpgp/PgpObjectFactory.cs b/crypto/src/openpgp/PgpObjectFactory.cs index f7bf89507..068b85154 100644 --- a/crypto/src/openpgp/PgpObjectFactory.cs +++ b/crypto/src/openpgp/PgpObjectFactory.cs @@ -72,9 +72,8 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp } case PacketTag.PublicKey: return new PgpPublicKeyRing(bcpgIn); - // TODO Make PgpPublicKey a PgpObject or return a PgpPublicKeyRing - //case PacketTag.PublicSubkey: - // return PgpPublicKeyRing.ReadSubkey(bcpgIn); + case PacketTag.PublicSubkey: + return PgpPublicKeyRing.ReadSubkey(bcpgIn); case PacketTag.CompressedData: return new PgpCompressedData(bcpgIn); case PacketTag.LiteralData: |