2003/12/13 00:44:41

darcs-hash:20040130074247-2ba56-3b30ae7d4fd084b4e56527c84c7ad7b51385955b.gz

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index e82e23c..5f89ce3 100644 (file)
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -189,7 +189,7 @@ public class HTTP {
     // Methods to attempt socket creation /////////////////////////////////////////////////////////////////
 
     private Socket getSocket(String host, int port, boolean ssl, boolean negotiate) throws IOException {
-        Socket ret = ssl ? new TinySSL(host, port, negotiate) : new Socket(java.net.InetAddress.getByName(host), port);
+        Socket ret = ssl ? new SSL(host, port, negotiate) : new Socket(java.net.InetAddress.getByName(host), port);
         ret.setTcpNoDelay(true);
         return ret;
     }
@@ -222,7 +222,7 @@ public class HTTP {
                 String s = br.readLine();
                 if (s.charAt(9) != '2') throw new HTTPException("proxy refused CONNECT method: \"" + s + "\"");
                 while (br.readLine().length() > 0) { };
-                ((TinySSL)sock).negotiate();
+                ((SSL)sock).negotiate();
             }
             return sock;
 
@@ -270,7 +270,7 @@ public class HTTP {
             dis.skip(6);                                 // ip/port
             
             if ((int)(success & 0xff) == 90) {
-                if (ssl) ((TinySSL)sock).negotiate();
+                if (ssl) ((SSL)sock).negotiate();
                 return sock;
             }
             if (Log.on) Log.log(this, "SOCKS server denied access, code " + (success & 0xff));

diff --git a/src/org/xwt/VectorGraphics.java b/src/org/xwt/VectorGraphics.java
index 4b29e47..988c18a 100644 (file)
--- a/src/org/xwt/VectorGraphics.java
+++ b/src/org/xwt/VectorGraphics.java
@@ -1,3 +1,4 @@
+// FIXME
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 import org.xwt.util.*;

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 5d18134..5fa9a8d 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -1,3 +1,4 @@
+// FIXME
 // Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 

diff --git a/src/org/xwt/TinySSL.java b/src/org/xwt/util/SSL.java
similarity index 98%
rename from src/org/xwt/TinySSL.java
rename to src/org/xwt/util/SSL.java
index db082fa..08d6fef 100644 (file)
--- a/src/org/xwt/TinySSL.java
+++ b/src/org/xwt/util/SSL.java
@@ -5,7 +5,7 @@
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
-package org.xwt;
+package org.xwt.util;
 
 import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.Digest;
@@ -87,16 +87,18 @@ import java.text.*;
    1.03 10-Aug-02  Fixed a vulnerability outlined at
                    http://online.securityfocus.com/archive/1/286290
 
+   1.04 12-Dec-03  Renamed to org.xwt.SSL, fixed race condition
+
 */
 
-public class TinySSL extends Socket {
+public class SSL extends Socket {
 
     // Simple Test //////////////////////////////////////////////
 
     public static void main(String[] args) {
         Log.on = true;
         try {
-            Socket s = new TinySSL("www.paypal.com", 443);
+            Socket s = new SSL("www.paypal.com", 443);
             PrintWriter pw = new PrintWriter(s.getOutputStream());
             BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream()));
             pw.println("GET / HTTP/1.0");
@@ -106,7 +108,7 @@ public class TinySSL extends Socket {
             while(true) {
                 String s2 = br.readLine();
                 if (s2 == null) return;
-                Log.log(TinySSL.class, s2);
+                Log.log(SSL.class, s2);
             }
             
         } catch (Exception e) {
@@ -161,14 +163,14 @@ public class TinySSL extends Socket {
     public InputStream getInputStream() throws IOException { return is != null ? is : super.getInputStream(); }
     public OutputStream getOutputStream() throws IOException { return os != null ? os : super.getOutputStream(); }
 
-    public TinySSL(String host, int port) throws IOException { this(host, port, true, false); }
-    public TinySSL(String host, int port, boolean negotiateImmediately) throws IOException { this(host, port, negotiateImmediately, false); }
-    public TinySSL(String host, int port, boolean negotiateImmediately, boolean ignoreUntrustedCert) throws IOException {
+    public SSL(String host, int port) throws IOException { this(host, port, true, false); }
+    public SSL(String host, int port, boolean negotiateImmediately) throws IOException { this(host, port, negotiateImmediately, false); }
+    public SSL(String host, int port, boolean negotiateImmediately, boolean ignoreUntrustedCert) throws IOException {
         super(host, port);
         if (!initializationFinished) {
-            synchronized(TinySSL.class) {
+            synchronized(SSL.class) {
                 while (!initializationFinished)
-                    try { TinySSL.class.wait(); } catch (Exception e) { }
+                    try { SSL.class.wait(); } catch (Exception e) { }
             }
         }
         hostname = host;
@@ -1539,7 +1541,7 @@ public class TinySSL extends Socket {
         for(int i=0; i<pad2_sha.length; i++) pad2_sha[i] = (byte)0x5C;
 
         try { 
-            if (Log.on) Log.log(TinySSL.class, "reading in trusted root public keys..."); 
+            if (Log.on) Log.log(SSL.class, "reading in trusted root public keys..."); 
             trusted_CA_public_keys = new SubjectPublicKeyInfo[base64_encoded_trusted_CA_public_keys.length / 2];
             trusted_CA_public_key_identifiers = new String[base64_encoded_trusted_CA_public_keys.length / 2];
             for(int i=0; i<base64_encoded_trusted_CA_public_keys.length; i+=2) {
@@ -1550,10 +1552,10 @@ public class TinySSL extends Socket {
             }
 
         } catch (Exception e) { 
-            if (Log.on) Log.log(TinySSL.class, e);
+            if (Log.on) Log.log(SSL.class, e);
         } 
         
-        if (Log.on) Log.log(TinySSL.class, "generating entropy..."); 
+        if (Log.on) Log.log(SSL.class, "generating entropy..."); 
         randpool = new byte[10];
         try { Thread.sleep(100); } catch (Exception e) { }
         for(int i=0; i<spinners.length; i++) {
@@ -1566,7 +1568,7 @@ public class TinySSL extends Socket {
         intToBytes(System.currentTimeMillis(), randpool, 0, 4); md5.update(randpool, 0, 4);
         intToBytes(Runtime.getRuntime().freeMemory(), randpool, 0, 4); md5.update(randpool, 0, 4);
         intToBytes(Runtime.getRuntime().totalMemory(), randpool, 0, 4); md5.update(randpool, 0, 4);
-        intToBytes(System.identityHashCode(TinySSL.class), randpool, 0, 4); md5.update(randpool, 0, 4);
+        intToBytes(System.identityHashCode(SSL.class), randpool, 0, 4); md5.update(randpool, 0, 4);
         Properties p = System.getProperties();
         for(Enumeration e = p.propertyNames(); e.hasMoreElements();) {
             String s = (String)e.nextElement();
@@ -1578,14 +1580,14 @@ public class TinySSL extends Socket {
         randpool = new byte[md5.getDigestSize()];
         md5.doFinal(randpool, 0);
 
-        if (Log.on) Log.log(TinySSL.class, "TinySSL is initialized."); 
+        if (Log.on) Log.log(SSL.class, "SSL is initialized."); 
         initializationFinished = true;
-        TinySSL.class.notifyAll();
+        SSL.class.notifyAll();
     } 
 
 
     /**
-     *  A PKCS1 encoder which uses TinySSL's built-in PRNG instead of java.security.SecureRandom.
+     *  A PKCS1 encoder which uses SSL's built-in PRNG instead of java.security.SecureRandom.
      *  This code was derived from BouncyCastle's org.bouncycastle.crypto.encoding.PKCS1Encoding.
      */
     private static class PKCS1 implements AsymmetricBlockCipher {