[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Sep  5 16:12:26 2013
New Revision: 4751

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4751&view=rev
Log:
Rebase DataSealer on AES-GCM using BC-native API.

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java?rev=4751&r1=4750&r2=4751&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java Thu Sep  5 16:12:26 2013
@@ -75,9 +75,6 @@
         dataSealer = new DataSealer();
         dataSealer.setCipherKeyAlias("secret");
         dataSealer.setCipherKeyPassword("kpassword");
-
-        dataSealer.setMacKeyAlias("secret");
-        dataSealer.setMacKeyPassword("kpassword");
 
         dataSealer.setKeystorePassword("password");
         dataSealer.setKeystorePath(keyStorePath);

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java?rev=4751&r1=4750&r2=4751&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java Thu Sep  5 16:12:26 2013
@@ -42,7 +42,7 @@
         CryptoTransientIdAttributeDefinition defn = getDefinition("cryptoWithTime.xml");
         
         DataSealer sealer = defn.getDataSealer();
-        Assert.assertEquals(sealer.getMacKeyAlias(), "secret");
+        Assert.assertEquals(sealer.getCipherKeyAlias(), "secret");
         defn.initialize();
         
         Assert.assertEquals(defn.getIdLifetime(), 3 * 60 * 1000);
@@ -56,7 +56,7 @@
         defn.initialize();
         
         DataSealer sealer = defn.getDataSealer();
-        Assert.assertEquals(sealer.getMacKeyAlias(), "secret");
+        Assert.assertEquals(sealer.getCipherKeyAlias(), "secret");
         
         Assert.assertEquals(defn.getIdLifetime(), 4 * 3600 * 1000);
     }