Fixes caAlias usage

Signed-off-by: Ben Rosenblum <[email protected]>
openhab · Jul 10, 2023 · dfcdc20 · dfcdc20
1 parent 95fe91d
commit dfcdc20
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...ore.crypto.cryptostore/src/main/java/org/openhab/core/crypto/cryptostore/CryptoStore.java b/...ore.crypto.cryptostore/src/main/java/org/openhab/core/crypto/cryptostore/CryptoStore.java
@@ -262,7 +262,8 @@ public void loadFromKeyStore(String keystorePassword, byte[] keyString)
         byte[] byteKey = keystore.getKey(this.alias, keystorePassword.toCharArray()).getEncoded();
         this.privKey = encrypt(new String(Base64.getEncoder().encode(byteKey)), key);
         setCert(keystore.getCertificate(this.alias));
-        Certificate caCert = keystore.getCertificate("trustedCa");
+        String caAlias = this.caAlias;
+        Certificate caCert = keystore.getCertificate(caAlias);
         if (caCert != null) {
             setCaCert(caCert);
         }
@@ -278,7 +279,8 @@ public KeyStore getKeyStore(String keystorePassword, byte[] keyString)
         keystore.setKeyEntry(this.alias, kf.generatePrivate(keySpec), keystorePassword.toCharArray(),
                 new java.security.cert.Certificate[] { getCert() });
         if (!caCert.isEmpty()) {
-            keystore.setCertificateEntry("trustedCa", getCaCert());
+            String caAlias = this.caAlias;
+            keystore.setCertificateEntry(caAlias, getCaCert());
         }
         return keystore;
     }