Skip to content

Handle encrypted key pair exception #338

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
djberg96 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −2
Open

Handle encrypted key pair exception #338

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
24 changes: 22 additions & 2 deletions src/main/java/org/jruby/ext/openssl/impl/PKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
import org.bouncycastle.openssl.PEMEncryptedKeyPair;
import org.bouncycastle.openssl.PEMParser;
import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
import org.bouncycastle.util.io.pem.PemObject;
import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;

import org.jruby.ext.openssl.SecurityHelper;
Expand Down Expand Up @@ -141,8 +144,25 @@ public static KeyPair readPrivateKey(final Type type, final PrivateKeyInfo keyIn
public static PublicKey readPublicKey(final byte[] input) throws IOException {
try (Reader in = new InputStreamReader(new ByteArrayInputStream(input))) {
Object pemObject = new PEMParser(in).readObject();
SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(pemObject);
return new JcaPEMKeyConverter().getPublicKey(publicKeyInfo);
try {
SubjectPublicKeyInfo publicKeyInfo = SubjectPublicKeyInfo.getInstance(pemObject);
return new JcaPEMKeyConverter().getPublicKey(publicKeyInfo);
} catch (IllegalArgumentException e) {
if (pemObject instanceof PEMEncryptedKeyPair) {
try {
PEMEncryptedKeyPair encrypted = (PEMEncryptedKeyPair) pemObject;
Copy link
Member

@kares kares Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we're dealing with the pemObject instanceof PEMEncryptedKeyPair then that could be checked earlier, instead of catching the IllegalArgumentException...

also bellow we just provide a null password and hope it works, why?

org.bouncycastle.openssl.PEMKeyPair pemKeyPair = encrypted.decryptKeyPair(new JcePEMDecryptorProviderBuilder().build((char[]) null));
KeyPair keyPair = new JcaPEMKeyConverter().getKeyPair(pemKeyPair);
return keyPair.getPublic();
} catch (Exception ex) {
throw new IOException("Encrypted private key requires password for public key reading", ex);
}
} else if (pemObject instanceof KeyPair) {
return ((KeyPair) pemObject).getPublic();
} else {
throw e;
}
}
}
}

Expand Down
Loading