diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-02-25 16:16:00 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-02-25 16:16:00 +0100 |
| commit | eabf9205def375a38dbbe80de3a472b3e40f1bdb (patch) | |
| tree | cfc493bfcd6e0dd2b8d0501d49309176d7916743 /eaaf_core_utils/src/main | |
| parent | 1ee6f1e152f3ff29d3f09c8078711fc6cb65a148 (diff) | |
| download | EAAF-Components-eabf9205def375a38dbbe80de3a472b3e40f1bdb.tar.gz EAAF-Components-eabf9205def375a38dbbe80de3a472b3e40f1bdb.tar.bz2 EAAF-Components-eabf9205def375a38dbbe80de3a472b3e40f1bdb.zip | |
update eaaf-utils to HSM-Facade v0.3.0-SNAPSHOT
Diffstat (limited to 'eaaf_core_utils/src/main')
| -rw-r--r-- | eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java | 6 | ||||
| -rw-r--r-- | eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java index 40bf7175..e60c326c 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/EaafKeyStoreFactory.java @@ -43,7 +43,6 @@ public class EaafKeyStoreFactory { public static final String CONFIG_PROP_HSM_FACADE_SSLTRUST = "security.hsmfacade.trustedsslcert"; public static final String CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME = "security.hsmfacade.username"; public static final String CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD = "security.hsmfacade.password"; - public static final String CONFIG_PROP_HSM_FACADE_HSM_NAME = "security.hsmfacade.hsmname"; public static final String ERRORCODE_00 = "internal.keystore.00"; public static final String ERRORCODE_01 = "internal.keystore.01"; @@ -128,12 +127,9 @@ public class EaafKeyStoreFactory { getConfigurationParameter(CONFIG_PROP_HSM_FACADE_CLIENT_USERNAME); final String clientPassword = getConfigurationParameter(CONFIG_PROP_HSM_FACADE_CLIENT_PASSWORD); - final String hsmName = - getConfigurationParameter(CONFIG_PROP_HSM_FACADE_HSM_NAME); final HsmFacadeProvider provider = HsmFacadeProvider.Companion.getInstance(); - provider.init(getHsmFacadeTrustSslCertificate(), clientUsername, clientPassword, hsmFacadeHost, port, - hsmName); + provider.init(getHsmFacadeTrustSslCertificate(), clientUsername, clientPassword, hsmFacadeHost, port); //Security.addProvider(provider); Security.insertProviderAt(provider, 0); isHsmFacadeInitialized = true; diff --git a/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties b/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties index 2d9a863a..f531e02d 100644 --- a/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties +++ b/eaaf_core_utils/src/main/resources/messages/eaaf_utils_message.properties @@ -1,3 +1,6 @@ +internal.configuration.00=Wrong configuration. Missing property: {0} +internal.configuration.01=Wrong configuration property: {0}. Reason: {1} + internal.keystore.00=HSM-Facade NOT INITIALIZED. KeyStore:{0} initialization failed internal.keystore.01=KeyStore:{0} configuration has an unsupported type in configuration. internal.keystore.02=Type:{1} of KeyStore:{0} is NOT SUPPORTED yet. |