finished last of the compile errors

[org.ibex.crypto.git] / src / org / ibex / net / ssl / GenCompactCAList.java

diff --git a/src/org/ibex/net/ssl/GenCompactCAList.java b/src/org/ibex/net/ssl/GenCompactCAList.java
index 51dd29e..e15a194 100644 (file)
--- a/src/org/ibex/net/ssl/GenCompactCAList.java
+++ b/src/org/ibex/net/ssl/GenCompactCAList.java
@@ -9,24 +9,24 @@ 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];
-        DEREncodableVector vec = new DEREncodableVector();
+        DER.EncodableVector vec = new DEREncodableVector();
         for(int i=1;i<args.length;i++) {
-            X509CertificateStructure x509 = new X509CertificateStructure((ASN1Sequence) new ASN1InputStream(new FileInputStream(args[i])).readObject());
-            X509Name subject = x509.getSubject();
+            X509.CertificateStructure x509 = new X509.CertificateStructure((ASN1Sequence) new ASN1InputStream(new FileInputStream(args[i])).readObject());
+            X509.Name subject = x509.getSubject();
             SubjectPublicKeyInfo pki = x509.getSubjectPublicKeyInfo();
-            RSAPublicKeyStructure rsa = new RSAPublicKeyStructure((ASN1Sequence) pki.getPublicKey());
-            DEREncodableVector vec2 = new DEREncodableVector();
+            RSA.PublicKeyStructure rsa = new RSA.PublicKeyStructure((ASN1Sequence) pki.getPublicKey());
+            DER.EncodableVector vec2 = new DEREncodableVector();
             vec2.add(subject);
             vec2.add(rsa);
             vec.add(new DERSequence(vec2));
         }
         if(format.equals("binary")) {
-            DEROutputStream dos = new DEROutputStream(System.out);
+            DER.OutputStream dos = new DEROutputStream(System.out);
             dos.writeObject(new DERSequence(vec));
             dos.close();
         } else if(format.equals("class")){
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DEROutputStream dos = new DEROutputStream(baos);
+            DER.OutputStream dos = new DEROutputStream(baos);
             dos.writeObject(new DERSequence(vec));
             dos.close();
             baos.close();