[utilities COMMIT] in /spring-extensions/trunk: pom.xml src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFac...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May  9 12:44:31 2014
New Revision: 568

URL: http://svn.shibboleth.net/view/utilities?rev=568&view=rev
Log:
Remove code that programatically adds BC security provider to JVM-wide Security config.
Remove explicit dependency on BC (still exists transitively through cryptacular).

Modified:
    spring-extensions/trunk/pom.xml
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java

Modified: spring-extensions/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/pom.xml?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- spring-extensions/trunk/pom.xml (original)
+++ spring-extensions/trunk/pom.xml Fri May  9 12:44:31 2014
@@ -83,11 +83,6 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java Fri May  9 12:44:31 2014
@@ -20,7 +20,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.security.PrivateKey;
-import java.security.Security;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -28,7 +27,6 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.cryptacular.util.KeyPairUtil;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.FactoryBean;
@@ -74,7 +72,6 @@
                 throw new BeanCreationException("Private key file must be provided in order to use this factory.");
             }
 
-            Security.addProvider(new BouncyCastleProvider());
             if (keyPass == null) {
                 key = KeyPairUtil.readPrivateKey(new FileInputStream(keyFile));
             } else {

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java Fri May  9 12:44:31 2014
@@ -20,13 +20,11 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.security.PublicKey;
-import java.security.Security;
 
 import javax.annotation.Nonnull;
 
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.cryptacular.util.KeyPairUtil;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.FactoryBean;
@@ -60,7 +58,6 @@
                 throw new BeanCreationException("Public key file must be provided in order to use this factory.");
             }
 
-            Security.addProvider(new BouncyCastleProvider());
             key = KeyPairUtil.readPublicKey(new FileInputStream(keyFile));
         }
 

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java?rev=568&r1=567&r2=568&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java Fri May  9 12:44:31 2014
@@ -19,14 +19,12 @@
 

[... 51 lines stripped ...]