fix make update-rootcerts

[org.ibex.crypto.git] / tools / GenCompactCAList.java

diff --git a/src/org/ibex/net/ssl/GenCompactCAList.java b/tools/GenCompactCAList.java
similarity index 85%
rename from src/org/ibex/net/ssl/GenCompactCAList.java
rename to tools/GenCompactCAList.java
index e15a194..c84ba57 100644 (file)
--- a/src/org/ibex/net/ssl/GenCompactCAList.java
+++ b/tools/GenCompactCAList.java
@@ -1,32 +1,30 @@
-package org.ibex.net.ssl;
 
 import java.io.*;
-//import org.bouncycastle.asn1.*;
-//import org.bouncycastle.asn1.x509.*;
+import org.bouncycastle.asn1.*;
+import org.bouncycastle.asn1.x509.*;
 
 public class GenCompactCAList {
-    /*
     public static void main(String[] args) throws Exception {
         if(args.length < 2) throw new Exception("Usage: GenCAList format file(s)");
         String format = args[0];
-        DER.EncodableVector vec = new DEREncodableVector();
+        DEREncodableVector vec = new DEREncodableVector();
         for(int i=1;i<args.length;i++) {
-            X509.CertificateStructure x509 = new X509.CertificateStructure((ASN1Sequence) new ASN1InputStream(new FileInputStream(args[i])).readObject());
-            X509.Name subject = x509.getSubject();
+            X509CertificateStructure x509 = new X509CertificateStructure((ASN1Sequence) new ASN1InputStream(new FileInputStream(args[i])).readObject());
+            X509Name subject = x509.getSubject();
             SubjectPublicKeyInfo pki = x509.getSubjectPublicKeyInfo();
-            RSA.PublicKeyStructure rsa = new RSA.PublicKeyStructure((ASN1Sequence) pki.getPublicKey());
-            DER.EncodableVector vec2 = new DEREncodableVector();
+            RSAPublicKeyStructure rsa = new RSAPublicKeyStructure((ASN1Sequence) pki.getPublicKey());
+            DEREncodableVector vec2 = new DEREncodableVector();
             vec2.add(subject);
             vec2.add(rsa);
             vec.add(new DERSequence(vec2));
         }
         if(format.equals("binary")) {
-            DER.OutputStream dos = new DEROutputStream(System.out);
+            DEROutputStream dos = new DEROutputStream(System.out);
             dos.writeObject(new DERSequence(vec));
             dos.close();
         } else if(format.equals("class")){
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DER.OutputStream dos = new DEROutputStream(baos);
+            DEROutputStream dos = new DEROutputStream(baos);
             dos.writeObject(new DERSequence(vec));
             dos.close();
             baos.close();            
@@ -94,5 +92,4 @@ public class GenCompactCAList {
         }
         return new String(buf);
     }
-    */
 }