Skip to content

common-security: add workaround bouncycastle EC algorithm name mismatch #8183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DmitryLitvintsev wants to merge 1 commit into
base: 12.0
Choose a base branch
from
Open

common-security: add workaround bouncycastle EC algorithm name mismatch #8183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions modules/common-security/src/main/java/org/dcache/ssl/CanlContextFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,19 @@ public KeyAndCertCredential0(PrivateKey privateKey, X509Certificate[] certificat
}

PublicKey pubKey = certificateChain[0].getPublicKey();
String pubKeyAlgorithm = pubKey.getAlgorithm();
// REVISIT: BouncyCastle uses "ECDSA" as the private key algorithm and "EC" as the public key algorithm names for elliptic curve keys.
if (!privateKey.getAlgorithm().equals(pubKeyAlgorithm) && !(privateKey.getAlgorithm().equals("ECDSA") && pubKeyAlgorithm.equals("EC")))
String pubAlg = pubKey.getAlgorithm();
String privAlg = privateKey.getAlgorithm();
// "EC" and "ECDSA" are both used for elliptic-curve keys depending on the
// provider and BouncyCastle version — treat them as equivalent.
boolean privIsEC = privAlg.equals("EC") || privAlg.equals("ECDSA");
boolean pubIsEC = pubAlg.equals("EC") || pubAlg.equals("ECDSA");

if (!privAlg.equals(pubAlg) && !(privIsEC && pubIsEC)) {
throw new KeyStoreException("Private and public keys are not matching: different algorithms: "
+ privateKey.getAlgorithm() + " vs. " + pubKeyAlgorithm);
+ privAlg + " vs. " + pubAlg);
}

switch (pubKeyAlgorithm) {
switch (pubAlg) {
case "DSA":
if (!checkKeysViaSignature("SHA1withDSA", privateKey, pubKey))
throw new KeyStoreException("Private and public keys are not matching: DSA");
Expand All @@ -425,8 +431,9 @@ public KeyAndCertCredential0(PrivateKey privateKey, X509Certificate[] certificat
if (!checkKeysViaSignature("GOST3411withECGOST3410", privateKey, pubKey))
throw new KeyStoreException("Private and public keys are not matching: EC GOST 34.10");
break;
case "EC":
case "ECDSA":
if (!checkKeysViaSignature("SHA1withECDSA", privateKey, pubKey))
if (!checkKeysViaSignature("SHA256withECDSA", privateKey, pubKey))
throw new KeyStoreException("Private and public keys are not matching: EC DSA");
break;
}
Expand Down
Loading