[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/security/DataSealer.ja...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Sep  5 21:43:54 2013
New Revision: 443

URL: http://svn.shibboleth.net/view/utilities?rev=443&view=rev
Log:
Add test for a legacy key (and a fix).

Modified:
    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/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=443&r1=442&r2=443&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 Thu Sep  5 21:43:54 2013
@@ -299,7 +299,7 @@
             inputDataStream.readFully(iv);
 
             final AEADParameters aeadParams =
-                    new AEADParameters(new KeyParameter(keyUsed.getEncoded()), 128, iv, cipherKeyAlias.getBytes());
+                    new AEADParameters(new KeyParameter(keyUsed.getEncoded()), 128, iv, keyAlias.getBytes());
             cipher.init(false, aeadParams);
 
             // Data can't be any bigger the original minus IV.

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java?rev=443&r1=442&r2=443&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/security/DataSealerTest.java Thu Sep  5 21:43:54 2013
@@ -112,6 +112,19 @@
         return sealer;
     }
 
+    private DataSealer createDataSealer2() throws DataSealerException, ComponentInitializationException {
+        DataSealer sealer = new DataSealer();
+        sealer.setCipherKeyAlias("secret2");
+        sealer.setCipherKeyPassword("kpassword");
+
+        sealer.setKeystorePassword("password");
+        sealer.setKeystorePath(keyStorePath);
+
+        sealer.initialize();
+
+        return sealer;
+    }
+    
     @Test public void encodeDecode() throws DataSealerException, ComponentInitializationException {
         final DataSealer sealer = createDataSealer();
 
@@ -119,6 +132,15 @@
         Assert.assertEquals(sealer.unwrap(encoded), THE_DATA);
     }
 
+    @Test public void encodeDecodeSecondKey() throws DataSealerException, ComponentInitializationException {
+        final DataSealer sealer = createDataSealer();
+        final DataSealer sealer2 = createDataSealer2();
+
+        String encoded = sealer.wrap(THE_DATA, System.currentTimeMillis() + 50000);
+        Assert.assertEquals(sealer.unwrap(encoded), THE_DATA);
+        Assert.assertEquals(sealer2.unwrap(encoded), THE_DATA);
+    }
+    
     @Test public void timeOut() throws DataSealerException, InterruptedException, ComponentInitializationException {
         final DataSealer sealer = createDataSealer();
 

Modified: java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/resources/data/net/shibboleth/utilities/java/support/security/SealerKeyStore.jks?rev=443&r1=442&r2=443&view=diff
==============================================================================
Binary files - no diff available.