From 3f618bea52ba3ea30282f43ee2baf16dbff850b3 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 10 Sep 2024 13:21:44 +0200 Subject: [PATCH] Fix properly parsing of bit strength for X25519/X448/Ed25519/Ed448 keys --- .../org/bouncycastle/openpgp/PGPPublicKey.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java index 2c788db3df..f61904c1c1 100644 --- a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java +++ b/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java @@ -10,6 +10,7 @@ import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.cryptlib.CryptlibObjectIdentifiers; +import org.bouncycastle.asn1.edec.EdECObjectIdentifiers; import org.bouncycastle.asn1.gnu.GNUObjectIdentifiers; import org.bouncycastle.asn1.x9.ECNamedCurveTable; import org.bouncycastle.asn1.x9.X9ECParametersHolder; @@ -17,7 +18,9 @@ import org.bouncycastle.bcpg.BCPGOutputStream; import org.bouncycastle.bcpg.DSAPublicBCPGKey; import org.bouncycastle.bcpg.ECPublicBCPGKey; +import org.bouncycastle.bcpg.Ed448PublicBCPGKey; import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; +import org.bouncycastle.bcpg.OctetArrayBCPGKey; import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; import org.bouncycastle.bcpg.PublicKeyPacket; import org.bouncycastle.bcpg.PublicSubkeyPacket; @@ -27,6 +30,7 @@ import org.bouncycastle.bcpg.UserAttributePacket; import org.bouncycastle.bcpg.UserDataPacket; import org.bouncycastle.bcpg.UserIDPacket; +import org.bouncycastle.bcpg.X448PublicBCPGKey; import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; import org.bouncycastle.util.Arrays; import org.bouncycastle.util.Pack; @@ -98,6 +102,14 @@ else if (key instanceof ECPublicBCPGKey) { this.keyStrength = 256; } + else if (curveOID.equals(EdECObjectIdentifiers.id_X448)) + { + this.keyStrength = X448PublicBCPGKey.LENGTH * 8; + } + else if (curveOID.equals(EdECObjectIdentifiers.id_Ed448)) + { + this.keyStrength = Ed448PublicBCPGKey.LENGTH * 8; + } else { X9ECParametersHolder ecParameters = ECNamedCurveTable.getByOIDLazy(curveOID); @@ -112,6 +124,10 @@ else if (key instanceof ECPublicBCPGKey) } } } + else if (key instanceof OctetArrayBCPGKey) + { + this.keyStrength = key.getEncoded().length * 8; + } } }