[utilities COMMIT] in /java-support/trunk: pom.xml src/main/java/net/shibboleth/utilities/java/support/security/Basic...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 29 12:55:02 2014
New Revision: 643

URL: http://svn.shibboleth.net/view/utilities?rev=643&view=rev
Log:
JSPT-47: key versioning revamp for DataSealer

Added:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategy.java   (with props)
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTool.java   (with props)
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/DataSealerKeyStrategy.java   (with props)
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/BasicKeystoreKeyStrategyTest.java   (with props)
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.kver2
Modified:
    java-support/trunk/pom.xml
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
    java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks

Modified: java-support/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/pom.xml?rev=643&r1=642&r2=643&view=diff
==============================================================================
--- java-support/trunk/pom.xml (original)
+++ java-support/trunk/pom.xml Tue Jul 29 12:55:02 2014
@@ -13,7 +13,7 @@
     <name>java-support</name>
     <groupId>net.shibboleth.utilities</groupId>
     <artifactId>java-support</artifactId>
-    <version>4.0-SNAPSHOT</version>
+    <version>5.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java?rev=643&r1=642&r2=643&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/security/DataSealer.java Tue Jul 29 12:55:02 2014
@@ -23,10 +23,7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.Key;
 import java.security.KeyException;
-import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -37,13 +34,12 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.codec.Base64Support;
+import net.shibboleth.utilities.java.support.collection.Pair;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.resource.Resource;
 
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.engines.AESEngine;
@@ -63,128 +59,25 @@
     /** Class logger. */
     @Nonnull private Logger log = LoggerFactory.getLogger(DataSealer.class);
 
-    /** Default key used for encryption. */
-    @NonnullAfterInit private SecretKey cipherKey;
+    /** Source of keys. */
+    @NonnullAfterInit private DataSealerKeyStrategy keyStrategy;
 
     /** Source of secure random data. */
     @NonnullAfterInit private SecureRandom random;
-
-    /** Type of keystore to use for access to keys. */
-    @NonnullAfterInit private String keystoreType;
-
-    /** Keystore resource. */
-    @NonnullAfterInit private Resource keystoreResource;
-
-    /** Password for keystore. */
-    @NonnullAfterInit private String keystorePassword;
-
-    /** Keystore alias for the default encryption key. */
-    @NonnullAfterInit private String cipherKeyAlias;
-
-    /** Password for encryption key(s). */
-    @NonnullAfterInit private String cipherKeyPassword;
-
-    /** Constructor. */
-    public DataSealer() {
-        keystoreType = "JCEKS";
-    }
     
-    /** {@inheritDoc} */
-    public void doInitialize() throws ComponentInitializationException {
-        try {
-            try {
-                Constraint.isNotNull(keystoreType, "Keystore type cannot be null");

[... 505 lines stripped ...]