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

[noreply at shibboleth.net]

Author: dfisher
Date: Wed Mar 12 15:58:46 2014
New Revision: 553

URL: http://svn.shibboleth.net/view/utilities?rev=553&view=rev
Log:
Replace vt-crypt dependency with cryptacular.
Update bouncycastle version to 1.50.

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=553&r1=552&r2=553&view=diff
==============================================================================
--- spring-extensions/trunk/pom.xml (original)
+++ spring-extensions/trunk/pom.xml Wed Mar 12 15:58:46 2014
@@ -58,8 +58,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>edu.vt.middleware</groupId>
-            <artifactId>vt-crypt</artifactId>
+            <groupId>org.cryptacular</groupId>
+            <artifactId>cryptacular</artifactId>
             <!-- Required for any classes that deals with cryptographic artifacts (keys, certs, algorithms, etc.) -->
             <optional>true</optional>
         </dependency>
@@ -84,7 +84,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15</artifactId>
+            <artifactId>bcprov-jdk15on</artifactId>
             <optional>true</optional>
         </dependency>
         <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=553&r1=552&r2=553&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 Wed Mar 12 15:58:46 2014
@@ -29,10 +29,9 @@
 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;
-
-import edu.vt.middleware.crypt.util.CryptReader;
 
 /**
  * Spring bean factory for producing a {@link PrivateKey} from a file.
@@ -77,9 +76,9 @@
 
             Security.addProvider(new BouncyCastleProvider());
             if (keyPass == null) {
-                key = CryptReader.readPrivateKey(new FileInputStream(keyFile));
+                key = KeyPairUtil.readPrivateKey(new FileInputStream(keyFile));
             } else {
-                key = CryptReader.readPrivateKey(new FileInputStream(keyFile), keyPass.toCharArray());
+                key = KeyPairUtil.readPrivateKey(new FileInputStream(keyFile), keyPass.toCharArray());
             }
         }
 

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=553&r1=552&r2=553&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 Wed Mar 12 15:58:46 2014
@@ -27,10 +27,9 @@
 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;
-
-import edu.vt.middleware.crypt.util.CryptReader;
 
 /**
  * Spring bean factory for producing a {@link PublicKey} from a file.
@@ -62,7 +61,7 @@
             }
 
             Security.addProvider(new BouncyCastleProvider());
-            key = CryptReader.readPublicKey(new FileInputStream(keyFile));
+            key = KeyPairUtil.readPublicKey(new FileInputStream(keyFile));
         }
 
         return key;

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=553&r1=552&r2=553&view=diff
==============================================================================

[... 51 lines stripped ...]