Rename named curve lookup method

vanitasvitae · vanitasvitae · commit 8004fb31210c · 2024-05-23T09:59:53.000+02:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java b/pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaPGPKeyConverter.java
@@ -557,10 +557,10 @@ private BCPGKey getPublicBCPGKey(int algorithm, PGPAlgorithmParameters algorithm
                 ASN1ObjectIdentifier curveOid;
                 curveOid = ASN1ObjectIdentifier.getInstance(enc);
 
-                // ecPublicKey is not specific enough. Drill down to find proper OID.
+                // BCECPublicKey uses explicit parameter encoding, so we need to find the named curve manually
                 if (X9ObjectIdentifiers.id_ecPublicKey.equals(curveOid))
                 {
-                    enc = getCurveOIDForBCECKey((BCECPublicKey) pubKey);
+                    enc = getNamedCurveOID((BCECPublicKey) pubKey);
                     ASN1ObjectIdentifier nCurveOid = ASN1ObjectIdentifier.getInstance(enc);
                     if (nCurveOid != null)
                     {
@@ -685,7 +685,7 @@ else if (pubKey.getAlgorithm().regionMatches(true, 0, "XDH", 0, 3))
         }
     }
 
-    private ASN1Encodable getCurveOIDForBCECKey(BCECPublicKey pubKey)
+    private ASN1Encodable getNamedCurveOID(BCECPublicKey pubKey)
     {
         // Iterate through all registered curves to find applicable OID
         Enumeration names = ECNamedCurveTable.getNames();

Original file line number	Diff line number	Diff line change
`@@ -557,10 +557,10 @@ private BCPGKey getPublicBCPGKey(int algorithm, PGPAlgorithmParameters algorithm`
`557`	`557`	`ASN1ObjectIdentifier curveOid;`
`558`	`558`	`curveOid = ASN1ObjectIdentifier.getInstance(enc);`
`559`	`559`
`560`		`- // ecPublicKey is not specific enough. Drill down to find proper OID.`
	`560`	`+ // BCECPublicKey uses explicit parameter encoding, so we need to find the named curve manually`
`561`	`561`	`if (X9ObjectIdentifiers.id_ecPublicKey.equals(curveOid))`
`562`	`562`	`{`
`563`		`- enc = getCurveOIDForBCECKey((BCECPublicKey) pubKey);`
	`563`	`+ enc = getNamedCurveOID((BCECPublicKey) pubKey);`
`564`	`564`	`ASN1ObjectIdentifier nCurveOid = ASN1ObjectIdentifier.getInstance(enc);`
`565`	`565`	`if (nCurveOid != null)`
`566`	`566`	`{`
`@@ -685,7 +685,7 @@ else if (pubKey.getAlgorithm().regionMatches(true, 0, "XDH", 0, 3))`
`685`	`685`	`}`
`686`	`686`	`}`
`687`	`687`
`688`		`- private ASN1Encodable getCurveOIDForBCECKey(BCECPublicKey pubKey)`
	`688`	`+ private ASN1Encodable getNamedCurveOID(BCECPublicKey pubKey)`
`689`	`689`	`{`
`690`	`690`	`// Iterate through all registered curves to find applicable OID`
`691`	`691`	`Enumeration names = ECNamedCurveTable.getNames();`