ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-01-01 10:46:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP: add support for EC private keys

Browse Source
This commit is contained in:
chubtub 2024-01-04 14:02:51 -05:00
parent 3ac30cfc5d
commit 36331ed4aa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/tcg_rim_tool/src/main/java/hirs/swid/CredentialParser.java
View File

@ -29,7 +29,7 @@ public class CredentialParser {
private static final String JKS = "JKS"; private static final String JKS = "JKS";
private static final String PEM = "PEM"; private static final String PEM = "PEM";
private static final String PKCS1_HEADER = "-----BEGIN RSA PRIVATE KEY-----"; private static final String PKCS1_HEADER = "-----BEGIN RSA PRIVATE KEY-----";
private static final String PKCS1_FOOTER = "-----END RSA PRIVATE KEY-----"; private static final String EC_HEADER = "-----BEGIN EC PRIVATE KEY-----";
private static final String PKCS8_HEADER = "-----BEGIN PRIVATE KEY-----"; private static final String PKCS8_HEADER = "-----BEGIN PRIVATE KEY-----";
private static final String PKCS8_FOOTER = "-----END PRIVATE KEY-----"; private static final String PKCS8_FOOTER = "-----END PRIVATE KEY-----";
private static final String CERTIFICATE_HEADER = "-----BEGIN CERTIFICATE-----"; private static final String CERTIFICATE_HEADER = "-----BEGIN CERTIFICATE-----";
@ -175,8 +175,9 @@ public class CredentialParser {
dis.close(); dis.close();
String privateKeyStr = new String(key); String privateKeyStr = new String(key);
if (privateKeyStr.contains(PKCS1_HEADER)) { if (privateKeyStr.contains(PKCS1_HEADER) ||
privateKey = getPKCS1KeyPair(filename).getPrivate(); privateKeyStr.contains(EC_HEADER)) {
privateKey = parseBase64KeyPair(filename).getPrivate();
} else if (privateKeyStr.contains(PKCS8_HEADER)) { } else if (privateKeyStr.contains(PKCS8_HEADER)) {
privateKeyStr = privateKeyStr.replace(PKCS8_HEADER, ""); privateKeyStr = privateKeyStr.replace(PKCS8_HEADER, "");
privateKeyStr = privateKeyStr.replace(PKCS8_FOOTER, ""); privateKeyStr = privateKeyStr.replace(PKCS8_FOOTER, "");
@ -217,11 +218,11 @@ public class CredentialParser {
} }
/** /**
* This method reads a PKCS1 keypair from a PEM file. * This method reads a base64 PEM string to parse a key pair.
* @param filename * @param filename
* @return * @return
*/ */
private KeyPair getPKCS1KeyPair(String filename) throws IOException { private KeyPair parseBase64KeyPair(String filename) throws IOException {
Security.addProvider(new BouncyCastleProvider()); Security.addProvider(new BouncyCastleProvider());
PEMParser pemParser = new PEMParser(new FileReader(filename)); PEMParser pemParser = new PEMParser(new FileReader(filename));
JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC"); JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");