Merge branch 'connector_update_SZRv4' into 'nightlybuild'

Integration of E-ID functionality

See merge request egiz/eidas_at_proxy!1

2 files changed, 11 insertions, 0 deletions

diff --git a/basicConfig/default_config.properties b/basicConfig/default_config.properties
index dda5144e..483e9c97 100644
--- a/basicConfig/default_config.properties
+++ b/basicConfig/default_config.properties
@@ -39,6 +39,7 @@ eidas.ms.auth.eIDAS.node_v2.loa.requested.minimum=http://eidas.europa.eu/LoA/hig
 eidas.ms.auth.eIDAS.szrclient.useTestService=true
 eidas.ms.auth.eIDAS.szrclient.endpoint.prod=
 eidas.ms.auth.eIDAS.szrclient.endpoint.test=http://localhost:1234/demoszr
+eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.type=pkcs12
 eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.path=keys/.....
 eidas.ms.auth.eIDAS.szrclient.ssl.keyStore.password=
 eidas.ms.auth.eIDAS.szrclient.ssl.trustStore.path=
@@ -50,6 +51,15 @@ eidas.ms.auth.eIDAS.szrclient.params.vkz=
 eidas.ms.auth.eIDAS.szrclient.params.useSZRForbPKCalculation=false
 
 
+## E-AuthBlock configuration
+eidas.ms.auth.eIDAS.authblock.keystore.type=jks
+eidas.ms.auth.eIDAS.authblock.keystore.path=keys/teststore.jks
+eidas.ms.auth.eIDAS.authblock.keystore.password=f/+saJBc3a}*/T^s
+eidas.ms.auth.eIDAS.authblock.keystore.name=
+eidas.ms.auth.eIDAS.authblock.key.alias=connectorkeypair
+eidas.ms.auth.eIDAS.authblock.key.password=f/+saJBc3a}*/T^s
+
+
 #Raw eIDAS Id data storage
 eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true
 
@@ -80,6 +90,7 @@ eidas.ms.auth.eIDAS.node_v2.attributes.requested.representation.5=LegalName,true
 
 
 ## PVP2 S-Profile end-point configuration
+eidas.ms.pvp2.keystore.type=jks
 eidas.ms.pvp2.keystore.path=keys/.....
 eidas.ms.pvp2.keystore.password=
 eidas.ms.pvp2.key.metadata.alias=
diff --git a/basicConfig/keys/teststore.jks b/basicConfig/keys/teststore.jks
new file mode 100644
index 00000000..fcc6400c
--- /dev/null
+++ b/basicConfig/keys/teststore.jks