Fix typo. Add TPM support for keyring password.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

Author: holgerfriedrich

bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/KNXBindingConstants.java

@@ -33,7 +33,7 @@
 public class KNXBindingConstants {
 
     public static final String BINDING_ID = "knx";
-    public static final String ENCYRPTED_PASSWORD_SERIALIZATION_PREFIX = "TpM2-pRoTeCteD-";
+    public static final String ENCRYPTED_PASSWORD_SERIALIZATION_PREFIX = "TpM2-pRoTeCteD-";
 
     // Global config
     public static final String CONFIG_DISABLE_UOM = "disableUoM";

bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/config/BridgeConfiguration.java

@@ -63,15 +63,15 @@ public String getKeyringFile() {
     }
 
     public String getKeyringPassword() {
-        return keyringPassword;
+        return decrypt(keyringPassword);
     }
 
     protected String decrypt(String secret) {
-        if (secret.startsWith(KNXBindingConstants.ENCYRPTED_PASSWORD_SERIALIZATION_PREFIX)) {
+        if (secret.startsWith(KNXBindingConstants.ENCRYPTED_PASSWORD_SERIALIZATION_PREFIX)) {
             try {
                 logger.info("trying to access TPM module");
                 return TpmInterface.TPM.deserializeAndDecryptSecret(
-                        secret.substring(KNXBindingConstants.ENCYRPTED_PASSWORD_SERIALIZATION_PREFIX.length()));
+                        secret.substring(KNXBindingConstants.ENCRYPTED_PASSWORD_SERIALIZATION_PREFIX.length()));
             } catch (SecurityException e) {
                 logger.error("Unable to decode stored password using TPM: {}", e.getMessage());
                 // fall through

bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/console/KNXCommandExtension.java

@@ -86,7 +86,7 @@ public void execute(String[] args, Console console) {
                 }
                 String p = TpmInterface.TPM.encryptAndSerializeSecret(args[1]);
                 console.println("encrypted representation of password");
-                console.println(KNXBindingConstants.ENCYRPTED_PASSWORD_SERIALIZATION_PREFIX + p);
+                console.println(KNXBindingConstants.ENCRYPTED_PASSWORD_SERIALIZATION_PREFIX + p);
 
                 // check if TPM can decrypt
                 String decrypted = TpmInterface.TPM.deserializeAndDecryptSecret(p);