Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge JDK 1.4 changes to the trunk.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@118487 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nicolson%netscape.com
2002-04-08 21:46:56 +00:00
parent c4e0b8c3b0
commit 2d421b1732
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/security/jss/org/mozilla/jss/ssl/SSLServerSocket.java
View File

@@ -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;

15
mozilla/security/jss/org/mozilla/jss/ssl/SSLSocket.java
View File

@@ -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;
}