[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/conf/global-system.xml

[noreply at shibboleth.net]

Author: scantor
Date: Thu Jul 24 11:24:58 2014
New Revision: 6342

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6342&view=rev
Log:
Tweak to DataSealer peoperties, will work on key versioning post alpha2

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6342&r1=6341&r2=6342&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Thu Jul 24 11:24:58 2014
@@ -7,10 +7,10 @@
 idp.entityID = https://idp.example.org
 
 # Settings for internal AES encryption key
-idp.sealer.storeType = JCEKS
+#idp.sealer.storeType = JCEKS
+#idp.sealer.aliasBase = idpSecretKey
 idp.sealer.storeResource = %{idp.home}/creds/sealer.jks
 idp.sealer.storePassword = password
-idp.sealer.alias = idpSecretKey
 idp.sealer.keyPassword = password
 
 # Settings for public/private signing and encryption key(s)

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=6342&r1=6341&r2=6342&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Thu Jul 24 11:24:58 2014
@@ -127,10 +127,10 @@
         p:secure="false" />
     
     <bean id="shibboleth.DataSealer" class="net.shibboleth.utilities.java.support.security.DataSealer"
-        p:keystoreType="%{idp.sealer.storeType}"
+        p:keystoreType="%{idp.sealer.storeType:JCEKS}"
         p:keystoreResource="%{idp.sealer.storeResource}"
         p:keystorePassword="%{idp.sealer.storePassword}"
-        p:cipherKeyAlias="%{idp.sealer.alias}"
+        p:cipherKeyAlias="%{idp.sealer.aliasBase:idpSecretKey}"
         p:cipherKeyPassword="%{idp.sealer.keyPassword}" />
     
     <bean id="shibboleth.StorageService"