From e02aa41578ec3e08dd96fde9ef0342b69a051ba6 Mon Sep 17 00:00:00 2001
From: Christian Kollmann <christian.kollmann@a-sit.at>
Date: Mon, 10 Feb 2020 12:39:09 +0100
Subject: Hack: Integrate HsmFacade for signing operations

---
 .../eaaf_module_pvp2_idp/src/test/resources/config/config_1.props     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'eaaf_modules/eaaf_module_pvp2_idp/src/test/resources')

diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props
index 6324f190..5dea3d51 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props
@@ -1,8 +1,8 @@
 keystore.path=classpath:/data/junit.jks
 keystore.pass=password
-key.metadata.alias=meta
+key.metadata.alias=shibboleth-sign
 key.metadata.pass=password
-key.sig.alias=sig
+key.sig.alias=shibboleth-sign
 key.sig.pass=password
 key.enc.alias=
 key.enc.pass=
-- 
cgit v1.2.3


From e23226c47807be597bbbae3891dbb94069d56836 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Fri, 14 Feb 2020 08:46:52 +0100
Subject: Integrate HSM Facade from A-SIT+ The EaafKeyStoreFactory can be used
 to build KeyStores from differend providers and types

---
 .../src/test/resources/config/config_1.props                 |  6 ++----
 .../src/test/resources/config/config_2.props                 | 12 ++++++++++++
 .../src/test/resources/spring/test_eaaf_core.beans.xml       |  3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_2.props

(limited to 'eaaf_modules/eaaf_module_pvp2_idp/src/test/resources')

diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props
index 5dea3d51..164b8807 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_1.props
@@ -1,14 +1,12 @@
 keystore.path=classpath:/data/junit.jks
 keystore.pass=password
-key.metadata.alias=shibboleth-sign
+key.metadata.alias=meta
 key.metadata.pass=password
-key.sig.alias=shibboleth-sign
+key.sig.alias=sig
 key.sig.pass=password
 key.enc.alias=
 key.enc.pass=
 
-pvp2.assertion.encryption.active=true
-
 client.http.connection.timeout.socket=2
 client.http.connection.timeout.connection=2
 client.http.connection.timeout.request=2
\ No newline at end of file
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_2.props b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_2.props
new file mode 100644
index 00000000..60cecebb
--- /dev/null
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/config/config_2.props
@@ -0,0 +1,12 @@
+keystore.path=classpath:/data/junit.jks
+keystore.pass=password
+key.metadata.alias=shibboleth-sign
+key.metadata.pass=password
+key.sig.alias=shibboleth-sign
+key.sig.pass=password
+key.enc.alias=
+key.enc.pass=
+
+client.http.connection.timeout.socket=2
+client.http.connection.timeout.connection=2
+client.http.connection.timeout.request=2
\ No newline at end of file
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml
index 375224bb..8c0b8596 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml
@@ -21,5 +21,8 @@
   
   <bean id="httpClientFactory"
         class="at.gv.egiz.eaaf.core.impl.utils.HttpClientFactory" />
+        
+  <bean id="eaafKeyStoreFactory"
+        class="at.gv.egiz.eaaf.core.impl.credential.EaafKeyStoreFactory" />        
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3