diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java
index ab4cfc9d2e7..fe4ef355432 100644
--- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java
+++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java
@@ -172,8 +172,8 @@ public class SSLServerSocket extends java.net.ServerSocket {
         return base.getTimeout();
     }
 
-    protected native void setReuseAddress(boolean reuse) throws SocketException;
-    protected native boolean getReuseAddress() throws SocketException;
+    public native void setReuseAddress(boolean reuse) throws SocketException;
+    public native boolean getReuseAddress() throws SocketException;
 
     private native byte[] socketAccept(SSLSocket s, int timeout,
         boolean handshakeAsClient) throws SocketException;
diff --git a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
index 327bd7574bc..01d7fa2ba9c 100644
--- a/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
+++ b/mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
@@ -750,5 +750,20 @@ public class SSLSocket extends java.net.Socket {
     public final static int TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA  = 0x0065;
     public final static int TLS_DHE_DSS_WITH_RC4_128_SHA            = 0x0066;
 
+// New TLS cipher suites in NSS 3.4 
+    public final static int TLS_RSA_WITH_AES_128_CBC_SHA          =  0x002F;
+    public final static int TLS_DH_DSS_WITH_AES_128_CBC_SHA       =  0x0030;
+    public final static int TLS_DH_RSA_WITH_AES_128_CBC_SHA       =  0x0031;
+    public final static int TLS_DHE_DSS_WITH_AES_128_CBC_SHA      =  0x0032;
+    public final static int TLS_DHE_RSA_WITH_AES_128_CBC_SHA      =  0x0033;
+    public final static int TLS_DH_ANON_WITH_AES_128_CBC_SHA      =  0x0034;
+
+    public final static int TLS_RSA_WITH_AES_256_CBC_SHA          =  0x0035;
+    public final static int TLS_DH_DSS_WITH_AES_256_CBC_SHA       =  0x0036;
+    public final static int TLS_DH_RSA_WITH_AES_256_CBC_SHA       =  0x0037;
+    public final static int TLS_DHE_DSS_WITH_AES_256_CBC_SHA      =  0x0038;
+    public final static int TLS_DHE_RSA_WITH_AES_256_CBC_SHA      =  0x0039;
+    public final static int TLS_DH_ANON_WITH_AES_256_CBC_SHA      =  0x003A;
+
 }