Mark.TwoFive/home-cert-assistant
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity Actions

feat: Implement Truststore/Keystore creation #17

Merged
MarkL4YG merged 3 commits from feat/truststorePoc into main 2024-11-23 19:24:43 +00:00
Conversation 0 Commits 3 Files changed 10 +2 -4
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d3ca9ae8d6 - Show all commits

6
src/main/java/de/mlessmann/certassist/keystore/KeyStoreManager.java
View file

@ -34,8 +34,6 @@ public class KeyStoreManager {
throws JavaSecurityException { throws JavaSecurityException {
try { try {
Path keystorePath = Files.createTempFile("keystore", ".jks"); Path keystorePath = Files.createTempFile("keystore", ".jks");
String keystorePassword = "changeit";
String alias = "mykey";
// Load the keystore // Load the keystore
KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType()); KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
@ -47,12 +45,12 @@ public class KeyStoreManager {
passwordProvider.getPasswordFor(serverCert.fingerprint()) passwordProvider.getPasswordFor(serverCert.fingerprint())
); );
Certificate[] certChain = loadCertificateChain(serverCert.fullchainPath()); Certificate[] certChain = loadCertificateChain(serverCert.fullchainPath());
keystore.setKeyEntry(alias, privateKey, keystorePassword.toCharArray(), certChain); keystore.setKeyEntry(serverCert.fingerprint(), privateKey, null, certChain);
} }
// Save the keystore // Save the keystore
try (var keystoreOut = Files.newOutputStream(keystorePath, CREATE_TRUNCATE)) { try (var keystoreOut = Files.newOutputStream(keystorePath, CREATE_TRUNCATE)) {
keystore.store(keystoreOut, keystorePassword.toCharArray()); keystore.store(keystoreOut, keyStorePassphrase.toCharArray());
} }
return new KeystoreResult(keystorePath); return new KeystoreResult(keystorePath);
} catch (IOException | KeyStoreException | NoSuchAlgorithmException | CertificateException e) { } catch (IOException | KeyStoreException | NoSuchAlgorithmException | CertificateException e) {