[java-opensaml COMMIT] in /trunk: opensaml-security-api/pom.xml opensaml-security-api/src/main/java/org/opensaml/secu...

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Feb 28 11:19:10 2014
New Revision: 3658

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3658&view=rev
Log:
Revert the vt-crypt -> cryptacular change until I fix the tests.

Modified:
    trunk/opensaml-security-api/pom.xml
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java
    trunk/opensaml-storage-impl/pom.xml

Modified: trunk/opensaml-security-api/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/pom.xml?rev=3658&r1=3657&r2=3658&view=diff
==============================================================================
--- trunk/opensaml-security-api/pom.xml (original)
+++ trunk/opensaml-security-api/pom.xml Fri Feb 28 11:19:10 2014
@@ -29,13 +29,13 @@
         </dependency>
         
         <dependency>
-            <groupId>org.cryptacular</groupId>
-            <artifactId>cryptacular</artifactId>
+            <groupId>edu.vt.middleware</groupId>
+            <artifactId>vt-crypt</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk15</artifactId>
         </dependency>
 
         <!-- Provided Dependencies -->
@@ -57,4 +57,4 @@
 
     </dependencies>
     
-</project>
+</project>

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java?rev=3658&r1=3657&r2=3658&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java Fri Feb 28 11:19:10 2014
@@ -17,6 +17,7 @@
 
 package org.opensaml.security.crypto;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
@@ -55,12 +56,14 @@
 import net.shibboleth.utilities.java.support.collection.LazyMap;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
-import org.cryptacular.util.KeyPairUtil;
 import org.opensaml.security.SecurityException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.io.Files;
+
+import edu.vt.middleware.crypt.CryptException;
+import edu.vt.middleware.crypt.io.PrivateKeyCredentialReader;
 
 /**
  * Helper methods for cryptographic keys and key pairs.
@@ -181,12 +184,20 @@
     @Nonnull public static PrivateKey decodePrivateKey(@Nonnull final byte[] key, @Nullable final char[] password)
             throws KeyException {
         Constraint.isNotNull(key, "Encoded key bytes cannot be null");
-
-        if (password != null && password.length > 0) {
-        	return KeyPairUtil.decodePrivateKey(key, password);
-        } else {
-        	return KeyPairUtil.decodePrivateKey(key);
-        } 
+        
+        PrivateKeyCredentialReader credReader = new PrivateKeyCredentialReader();
+        ByteArrayInputStream bais = new ByteArrayInputStream(key);
+        try {
+            if (password != null && password.length > 0) {
+                return credReader.read(bais, password);
+            } else {
+                return credReader.read(bais);
+            } 
+        } catch (IOException e) {
+            throw new KeyException("Unable to decode private key", e);
+        } catch (CryptException e) {
+            throw new KeyException("Unable to decode private key", e);
+        }
     }
     
     /**

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java?rev=3658&r1=3657&r2=3658&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java Fri Feb 28 11:19:10 2014
@@ -47,15 +47,14 @@
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1String;
+import org.bouncycastle.asn1.DERObject;
 import org.bouncycastle.asn1.DERObjectIdentifier;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERSet;
+import org.bouncycastle.asn1.DERString;
 import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
+import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
 import org.bouncycastle.x509.extension.X509ExtensionUtil;
-import org.cryptacular.util.CertUtil;
-import org.cryptacular.util.CodecUtil;
 import org.opensaml.security.SecurityException;

[... 139 lines stripped ...]