X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fibex%2Fcrypto%2FDER.java;h=c313bd9f2f2493ade37739ee03697d72ec34fc8a;hb=ed61cfa8521a699d1886165842cdf17e37e3e60e;hp=4fba365fc299c5c33e9d46bcf8d175a74cbfe36d;hpb=4c1f76f2d51e8c0a8465a96d34ee201e35b00475;p=org.ibex.crypto.git

diff --git a/src/org/ibex/crypto/DER.java b/src/org/ibex/crypto/DER.java
index 4fba365..c313bd9 100644
--- a/src/org/ibex/crypto/DER.java
+++ b/src/org/ibex/crypto/DER.java
@@ -19,12 +19,12 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDER.S BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  */
-package org.ibex.der;
+package org.ibex.crypto;
 import java.io.IOException;
 import java.io.*;
 import java.text.ParseException;
@@ -33,25 +33,25 @@ import java.util.*;
 import java.math.BigInteger;
 
 public class DER {
-    public class Null {
+    public static class Null {
         final static Null instance = new Null();
         private Null() { /* noop */ }
         public boolean equals(Object o) { return o == this; }
     }
 
-    public class TaggedObject {
+    public static class TaggedObject {
         public final Object object;
         public final int tag;
         public TaggedObject(int tag, Object object) { this.tag = tag; this.object = object; }
     }
 
-    public class UnknownObject {
+    public static class UnknownObject {
         public final byte[] data;
         public final int tag;
         public UnknownObject(int tag,byte[] data) { this.tag = tag; this.data = data; }
     }
 
-    public class BitString {
+    public static class BitString {
         public final int paddingBits;
         public final byte[] data;
     
@@ -61,11 +61,11 @@ public class DER {
         }
     }
 
-    public class Exception extends java.io.IOException {
+    public static class Exception extends java.io.IOException {
         public Exception(String s) { super(s); }
     }
 
-    public class InputStream extends FilterInputStream {
+    public static class InputStream extends FilterInputStream {
         private static final int MAX_OBJECT_SIZE = 4*1024*1024;
     
         private int limit;
@@ -73,8 +73,8 @@ public class DER {
         private int pos;
         public int getPos() { return pos; }
     
-        public InputStream(InputStream is) { this(is,-1); } 
-        public InputStream(InputStream is, int limit) {
+        public InputStream(java.io.InputStream is) { this(is,-1); } 
+        public InputStream(java.io.InputStream is, int limit) {
             super(is);
             this.limit = limit;
         }