aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2015-08-27 12:07:52 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-08-27 12:07:52 +0200
commit1051a42329a603821f415383343d253724d4cd65 (patch)
treef8a0b6e8445b7034dfe38d6ba3a61f1429a75a6e /id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
parentbb1b12ac5b240629e16ea1c7a50891e99f4adc14 (diff)
parenteb0cf88708f3d689c2cb6bb0dbf83dd290bee887 (diff)
downloadmoa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.gz
moa-id-spss-1051a42329a603821f415383343d253724d4cd65.tar.bz2
moa-id-spss-1051a42329a603821f415383343d253724d4cd65.zip
Merge STORK-SAML-Engine 1.5.1 and STORK-Commons 1.5.1
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
Diffstat (limited to 'id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml')
-rw-r--r--id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
index 4c14a1711..f9ebc85cc 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
@@ -2,11 +2,11 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
- <comment>SWModule sign with JKS.</comment>
- <entry key="keystorePath">C:\opt\keystores\keyStoreCountry3.jks</entry>
- <entry key="keyStorePassword">local-demo</entry>
- <entry key="keyPassword">local-demo</entry>
- <entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
- <entry key="serialNumber">4BA89DB2</entry>
- <entry key="keystoreType">JKS</entry>
+ <comment>SWModule sign with JKS.</comment>
+ <entry key="keystorePath">C:\opt\keystores\keyStoreCountry3.jks</entry>
+ <entry key="keyStorePassword">local-demo</entry>
+ <entry key="keyPassword">local-demo</entry>
+ <entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
+ <entry key="serialNumber">4BA89DB2</entry>
+ <entry key="keystoreType">JKS</entry>
</properties> \ No newline at end of file