Skip to content

Parse the pem to skip the seed, like using: #906

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Parse the pem to skip the seed, like using: #906

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
38 changes: 37 additions & 1 deletion java/org/apache/tomcat/util/net/jsse/PEMFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,43 @@ private PrivateKey toPrivateKey(String keyAlgorithm, Format format, String filen
break;
}
case PKCS8: {
keySpec = new PKCS8EncodedKeySpec(source);
// Parse the private key.
Asn1Parser p = new Asn1Parser(source);
p.parseTag(0x30);
p.parseFullLength();
BigInteger version = p.parseInt();
// Private key algorithm
p.parseTag(0x30);
int pkeyalgoLen = p.parseLength();
byte[] pkeyalgo = new byte[pkeyalgoLen];
p.parseBytes(pkeyalgo);
// Private key
p.parseTag(0x04);
int privateKeyLen = p.parseLength();
byte[] privateKey = new byte[privateKeyLen];
p.parseBytes(privateKey);
/* try to parse it (using the openssl specifications) */
/* we try to remove the seed JSSE can't parse */
try {
Asn1Parser otherp = new Asn1Parser(privateKey);
otherp.parseTag(0x30);
otherp.parseFullLength();
// {SEED + KEY} sequence
byte[] seed = otherp.parseOctetString();
byte[] okey = otherp.parseOctetString();
privateKey = Asn1Writer.writeTag((byte)4, okey);
} catch (Exception e) {
// Ignore
}

// rebuild the key we parsed
// sequence version: + pkeyalgo + private key
byte[] realprivateKey = Asn1Writer.writeSequence(
Asn1Writer.writeInteger(0),
Asn1Writer.writeTag((byte)0x30, pkeyalgo),
Asn1Writer.writeTag((byte)0x04, privateKey));

keySpec = new PKCS8EncodedKeySpec(realprivateKey);
break;
}
case RFC5915: {
Expand Down
Loading