diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
index 4274caf5759..7a7fcbc9555 100644
--- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
+++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
@@ -37,8 +37,7 @@ import java.net.*;
 import java.net.SocketException;
 import java.io.*;
 import java.io.IOException;
-import java.util.LinkedList;
-import java.util.ListIterator;
+import java.util.Vector;
 
 public class SSLSocket extends java.net.Socket {
 
@@ -259,15 +258,15 @@ public class SSLSocket extends java.net.Socket {
     ////////////////////////////////////////////////////////////////////
     // SSL-specific stuff
     ////////////////////////////////////////////////////////////////////
-    private LinkedList handshakeCompletedListeners = new LinkedList();
+    private Vector handshakeCompletedListeners = new Vector();
 
     public void addHandshakeCompletedListener(SSLHandshakeCompletedListener l) {
-        handshakeCompletedListeners.add(l);
+        handshakeCompletedListeners.addElement(l);
     }
 
     public void removeHandshakeCompletedListener(
             SSLHandshakeCompletedListener l) {
-        handshakeCompletedListeners.remove(l);
+        handshakeCompletedListeners.removeElement(l);
     }
 
     private void notifyAllHandshakeListeners() {
@@ -275,11 +274,11 @@ public class SSLSocket extends java.net.Socket {
             new SSLHandshakeCompletedEvent(this);
 
         /* XXX NOT THREAD SAFE */
-        ListIterator iter = handshakeCompletedListeners.listIterator(0);
-        while( iter.hasNext() ) {
+        int i;
+        for( i=0; i < handshakeCompletedListeners.size(); ++i) {
             SSLHandshakeCompletedListener l =
-                (SSLHandshakeCompletedListener) iter.next();
-
+                (SSLHandshakeCompletedListener)
+                 handshakeCompletedListeners.elementAt(i);
             l.handshakeCompleted(event);
         }
     }
diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/jssl.h b/mozilla/security/jss/org/mozilla/jss/ssl/jssl.h
index fe2deed36ae..bede4bf77ba 100644
--- a/mozilla/security/jss/org/mozilla/jss/ssl/jssl.h
+++ b/mozilla/security/jss/org/mozilla/jss/ssl/jssl.h
@@ -118,8 +118,8 @@ JSSL_CreateSocketData(JNIEnv *env, jobject sockObj, PRFileDesc* newFD);
 void
 JSSL_setNeedClientAuthNoExpiryCheck(JNIEnv *env, jobject self, jboolean b);
 
-#define SSL_POLICY_DOMESTIC org_mozilla_jss_ssl_SSLSocket_SSL_POLICY_DOMESTIC
-#define SSL_POLICY_EXPORT org_mozilla_jss_ssl_SSLSocket_SSL_POLICY_EXPORT
-#define SSL_POLICY_FRANCE org_mozilla_jss_ssl_SSLSocket_SSL_POLICY_FRANCE
+#define SSL_POLICY_DOMESTIC 0
+#define SSL_POLICY_EXPORT 1
+#define SSL_POLICY_FRANCE 2
 
 #endif