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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Mar  2 18:15:35 2014
New Revision: 5508

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5508&view=rev
Log:
Port over crypto variant for transient generation

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientIdGenerationStrategy.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/StoredTransientIdGenerationStrategy.java
      - copied, changed from r5506, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/StoredTransientIdGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientIdGenerationStrategy.java
      - copied, changed from r5506, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientIdGenerator.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientSAML1NameIdentifierGeneratorTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientSAML2NameIDGeneratorTest.java   (with props)
Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinition.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/resolver/TransientIdAttributeDefinition.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/StoredTransientIdGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientIdGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientSAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/StoredTransientSAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/StoredTransientSAML2NameIDGeneratorTest.java

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=5508&r1=5507&r2=5508&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 Sun Mar  2 18:15:35 2014
@@ -21,7 +21,6 @@
 import net.shibboleth.idp.attribute.resolver.spring.ad.CryptoTransientIdAttributeDefinitionParser;
 import net.shibboleth.idp.saml.impl.attribute.resolver.CryptoTransientIdAttributeDefinition;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.security.DataSealer;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -41,8 +40,6 @@
 
         CryptoTransientIdAttributeDefinition defn = getDefinition("cryptoWithTime.xml");
         
-        DataSealer sealer = defn.getDataSealer();
-        Assert.assertEquals(sealer.getCipherKeyAlias(), "secret");
         defn.initialize();
         
         Assert.assertEquals(defn.getIdLifetime(), 3 * 60 * 1000);
@@ -55,9 +52,6 @@
         CryptoTransientIdAttributeDefinition defn = getDefinition("cryptoNoTime.xml");
         defn.initialize();
         
-        DataSealer sealer = defn.getDataSealer();
-        Assert.assertEquals(sealer.getCipherKeyAlias(), "secret");
-        
         Assert.assertEquals(defn.getIdLifetime(), 4 * 3600 * 1000);
     }
 

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=5508&r1=5507&r2=5508&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Sun Mar  2 18:15:35 2014

[... 881 lines stripped ...]