Skip to content

Commit 8f258b1

Browse files
committed
Fix PGPKeyConverter classes support for X448,Ed448,X25519,Ed25519
1 parent 472d768 commit 8f258b1

File tree

3 files changed

+413
-164
lines changed

3 files changed

+413
-164
lines changed

pg/src/main/java/org/bouncycastle/openpgp/operator/PGPKeyConverter.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ protected PGPKeyConverter()
7474
* <td>SHA2-256</td>
7575
* <td>AES-128</td>
7676
* </tr>
77+
* <tr>
78+
* <td>Curve448</td>
79+
* <td>SHA2-512</td>
80+
* <td>AES-256</td>
81+
* </tr>
7782
* </table>
7883
*/
7984
protected PGPKdfParameters implGetKdfParameters(ASN1ObjectIdentifier curveID, PGPAlgorithmParameters algorithmParameters)
@@ -89,7 +94,8 @@ else if (curveID.equals(SECObjectIdentifiers.secp384r1) || curveID.equals(TeleTr
8994
{
9095
return new PGPKdfParameters(HashAlgorithmTags.SHA384, SymmetricKeyAlgorithmTags.AES_192);
9196
}
92-
else if (curveID.equals(SECObjectIdentifiers.secp521r1) || curveID.equals(TeleTrusTObjectIdentifiers.brainpoolP512r1))
97+
else if (curveID.equals(SECObjectIdentifiers.secp521r1) || curveID.equals(TeleTrusTObjectIdentifiers.brainpoolP512r1)
98+
|| curveID.equals(EdECObjectIdentifiers.id_X448))
9399
{
94100
return new PGPKdfParameters(HashAlgorithmTags.SHA512, SymmetricKeyAlgorithmTags.AES_256);
95101
}

0 commit comments

Comments
 (0)