[utilities COMMIT] in /ant-extensions/trunk: .classpath pom.xml src/main/java/edu/internet2/middleware/ant/pki/RdnCon...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug  6 20:26:51 2014
New Revision: 653

URL: http://svn.shibboleth.net/view/utilities?rev=653&view=rev
Log:
Update to latest BC version, and port cert generation to new APIs.

Modified:
    ant-extensions/trunk/.classpath
    ant-extensions/trunk/pom.xml
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/pki/RdnConverter.java
    ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/pki/SelfSignedCertificate.java

Modified: ant-extensions/trunk/.classpath
URL: http://svn.shibboleth.net/view/utilities/ant-extensions/trunk/.classpath?rev=653&r1=652&r2=653&view=diff
==============================================================================
--- ant-extensions/trunk/.classpath (original)
+++ ant-extensions/trunk/.classpath Wed Aug  6 20:26:51 2014
@@ -22,12 +22,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

Modified: ant-extensions/trunk/pom.xml
URL: http://svn.shibboleth.net/view/utilities/ant-extensions/trunk/pom.xml?rev=653&r1=652&r2=653&view=diff
==============================================================================
--- ant-extensions/trunk/pom.xml (original)
+++ ant-extensions/trunk/pom.xml Wed Aug  6 20:26:51 2014
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>net.shibboleth</groupId>
-        <artifactId>parent-v3</artifactId>
+        <artifactId>parent-v2</artifactId>
         <version>TRUNK-SNAPSHOT</version>
     </parent>
 
@@ -41,11 +41,16 @@
 
     <dependencies>
         <!-- Compile Dependencies -->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15</artifactId>
-            <version>1.46</version>
-        </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>1.51</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>1.51</version>
+            </dependency>
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>

Modified: ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/pki/SelfSignedCertificate.java
URL: http://svn.shibboleth.net/view/utilities/ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/pki/SelfSignedCertificate.java?rev=653&r1=652&r2=653&view=diff
==============================================================================
--- ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/pki/SelfSignedCertificate.java (original)
+++ ant-extensions/trunk/src/main/java/edu/internet2/middleware/ant/pki/SelfSignedCertificate.java Wed Aug  6 20:26:51 2014
@@ -28,6 +28,7 @@
 import java.security.SecureRandom;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.GregorianCalendar;
 
 import org.apache.tools.ant.BuildException;
@@ -36,13 +37,17 @@
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.DERSequence;
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.Extension;
 import org.bouncycastle.asn1.x509.GeneralName;
 import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.openssl.PEMWriter;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-import org.bouncycastle.x509.extension.SubjectKeyIdentifierStructure;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.X509v3CertificateBuilder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 
 /**
  * An ant task that generates a self-signed certificate.
@@ -59,10 +64,10 @@
  * <li><strong>privateKeyFile</strong> - file to which the generated private key will be written, in PEM format</li>
  * <li><strong>certifcateFile</strong> - file to which the self-signed certificate will be written, in PEM format</li>

[... 93 lines stripped ...]