cleanup

darcs-hash:20040728121518-24bed-1f978043e837c90cacb2306c3d0a14c297e8d43f.gz

diff --git a/src/org/ibex/crypto/AES.java b/src/org/ibex/crypto/AES.java
index 3f6ea69..d1173ca 100644 (file)
--- a/src/org/ibex/crypto/AES.java
+++ b/src/org/ibex/crypto/AES.java
@@ -38,6 +38,8 @@ public class AES implements Cipher {
         }
     }
     
+    // everything below if from BouncyCastle
+    
     /**
      * an implementation of the AES (Rijndael), from FIPS-197.
      * <p>

diff --git a/src/org/ibex/crypto/Base64.java b/src/org/ibex/crypto/Base64.java
index a82e44e..5f66130 100644 (file)
--- a/src/org/ibex/crypto/Base64.java
+++ b/src/org/ibex/crypto/Base64.java
@@ -1,3 +1,7 @@
+/*
+ * org.ibex.crypto.Base64 - By Brian Alliet
+ * Copyright (C) 2004 Brian Alliet
+ */
 package org.ibex.crypto;
 
 import java.io.UnsupportedEncodingException;

diff --git a/src/org/ibex/crypto/DER.java b/src/org/ibex/crypto/DER.java
index b683a05..7af585c 100644 (file)
--- a/src/org/ibex/crypto/DER.java
+++ b/src/org/ibex/crypto/DER.java
@@ -1,5 +1,5 @@
 /*
- * org.ibex.der.* - By Brian Alliet
+ * org.ibex.crypto.DER - By Brian Alliet
  * Copyright (C) 2004 Brian Alliet
  * 
  * Based on Bouncy Castle by The Legion Of The Bouncy Castle
@@ -33,6 +33,8 @@ import java.util.*;
 import java.math.BigInteger;
 
 public class DER {
+    private DER() { }
+    
     public static class Null {
         final static Null instance = new Null();
         private Null() { /* noop */ }

diff --git a/src/org/ibex/crypto/HMAC.java b/src/org/ibex/crypto/HMAC.java
index f531b72..22fb126 100644 (file)
--- a/src/org/ibex/crypto/HMAC.java
+++ b/src/org/ibex/crypto/HMAC.java
@@ -1,7 +1,3 @@
-// Copyright 2000-2005 the Contributors, as shown in the revision logs.
-// Licensed under the Apache Public Source License 2.0 ("the License").
-// You may not use this file except in compliance with the License.
-
 package org.ibex.crypto;
 
 public class HMAC extends Digest {

diff --git a/src/org/ibex/crypto/PKCS1.java b/src/org/ibex/crypto/PKCS1.java
index 05ed788..054f538 100644 (file)
--- a/src/org/ibex/crypto/PKCS1.java
+++ b/src/org/ibex/crypto/PKCS1.java
@@ -1,7 +1,3 @@
-// Copyright 2000-2005 the Contributors, as shown in the revision logs.
-// Licensed under the Apache Public Source License 2.0 ("the License").
-// You may not use this file except in compliance with the License.
-
 package org.ibex.crypto;
 import java.security.SecureRandom;
 

diff --git a/src/org/ibex/crypto/RC4.java b/src/org/ibex/crypto/RC4.java
index 907ebcc..8891ec7 100644 (file)
--- a/src/org/ibex/crypto/RC4.java
+++ b/src/org/ibex/crypto/RC4.java
@@ -1,9 +1,6 @@
-// Copyright 2000-2005 the Contributors, as shown in the revision logs.
-// Licensed under the Apache Public Source License 2.0 ("the License").
-// You may not use this file except in compliance with the License.
-
 package org.ibex.crypto;
 
+package org.ibex.crypto;
 
 public class RC4 implements Cipher {
     private final byte[] s = new byte[256];

diff --git a/src/org/ibex/crypto/RSA.java b/src/org/ibex/crypto/RSA.java
index 69a70b2..c6590a8 100644 (file)
--- a/src/org/ibex/crypto/RSA.java
+++ b/src/org/ibex/crypto/RSA.java
@@ -1,7 +1,3 @@
-// Copyright 2000-2005 the Contributors, as shown in the revision logs.
-// Licensed under the Apache Public Source License 2.0 ("the License").
-// You may not use this file except in compliance with the License.
-
 package org.ibex.crypto;
 import java.math.BigInteger;
 import java.util.*;

diff --git a/src/org/ibex/crypto/X509.java b/src/org/ibex/crypto/X509.java
index 09db7be..f39f5d7 100644 (file)
--- a/src/org/ibex/crypto/X509.java
+++ b/src/org/ibex/crypto/X509.java
@@ -31,6 +31,8 @@ import java.io.*;
 import java.util.*;
 
 public class X509 {
+    private X509() { }
+    
     public static class Certificate {
         public static final String RSA_ENCRYPTION           = "1.2.840.113549.1.1.1";
         public static final String MD2_WITH_RSA_ENCRYPTION  = "1.2.840.113549.1.1.2";

diff --git a/src/org/ibex/net/SSL.java b/src/org/ibex/net/SSL.java
index 37f7f8b..39d7f9c 100644 (file)
--- a/src/org/ibex/net/SSL.java
+++ b/src/org/ibex/net/SSL.java
@@ -988,8 +988,8 @@ public class SSL extends Socket {
     }
     
     public static boolean debugOn = false;
-    private static void debug(Object o) { if(debugOn) System.err.println("[BriSSL-Debug] " + o.toString()); }
-    private static void log(Object o) { System.err.println("[BriSSL] " + o.toString()); }
+    private static void debug(Object o) { if(debugOn) System.err.println("[IbexSSLL-Debug] " + o.toString()); }
+    private static void log(Object o) { System.err.println("[IbexSSL] " + o.toString()); }
             
     private static void verifyCerts(X509.Certificate[] certs) throws DER.Exception, Exn {
         try {