diff -r 49b7de969579 -r e71aa0962e70 jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java --- a/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java Sat Nov 24 03:34:27 2012 -0800 +++ b/jdk/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java Sat Nov 24 04:09:19 2012 -0800 @@ -29,13 +29,11 @@ import java.io.IOException; import java.net.InetAddress; import java.net.Socket; -import java.net.ServerSocket; import java.security.AlgorithmConstraints; import java.util.*; -import javax.net.ServerSocketFactory; import javax.net.ssl.SSLException; import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLParameters; @@ -172,6 +170,7 @@ * * @return an array of cipher suite names */ + @Override public String[] getSupportedCipherSuites() { return sslContext.getSupportedCipherSuiteList().toStringArray(); } @@ -181,6 +180,7 @@ * for use by newly accepted connections. A null return indicates * that the system defaults are in effect. */ + @Override synchronized public String[] getEnabledCipherSuites() { return enabledCipherSuites.toStringArray(); } @@ -192,11 +192,13 @@ * @param suites Names of all the cipher suites to enable; null * means to accept system defaults. */ + @Override synchronized public void setEnabledCipherSuites(String[] suites) { enabledCipherSuites = new CipherSuiteList(suites); checkedEnabled = false; } + @Override public String[] getSupportedProtocols() { return sslContext.getSuportedProtocolList().toStringArray(); } @@ -210,10 +212,12 @@ * @exception IllegalArgumentException when one of the protocols * named by the parameter is not supported. */ + @Override synchronized public void setEnabledProtocols(String[] protocols) { enabledProtocols = new ProtocolList(protocols); } + @Override synchronized public String[] getEnabledProtocols() { return enabledProtocols.toStringArray(); } @@ -222,11 +226,13 @@ * Controls whether the connections which are accepted must include * client authentication. */ + @Override public void setNeedClientAuth(boolean flag) { doClientAuth = (flag ? SSLEngineImpl.clauth_required : SSLEngineImpl.clauth_none); } + @Override public boolean getNeedClientAuth() { return (doClientAuth == SSLEngineImpl.clauth_required); } @@ -235,11 +241,13 @@ * Controls whether the connections which are accepted should request * client authentication. */ + @Override public void setWantClientAuth(boolean flag) { doClientAuth = (flag ? SSLEngineImpl.clauth_requested : SSLEngineImpl.clauth_none); } + @Override public boolean getWantClientAuth() { return (doClientAuth == SSLEngineImpl.clauth_requested); } @@ -250,6 +258,7 @@ * FTP clients, which accept connections from servers and should be * rejoining the already-negotiated SSL connection. */ + @Override public void setUseClientMode(boolean flag) { /* * If we need to change the socket mode and the enabled @@ -264,6 +273,7 @@ useServerMode = !flag; } + @Override public boolean getUseClientMode() { return !useServerMode; } @@ -273,6 +283,7 @@ * Controls whether new connections may cause creation of new SSL * sessions. */ + @Override public void setEnableSessionCreation(boolean flag) { enableSessionCreation = flag; } @@ -281,6 +292,7 @@ * Returns true if new connections may cause creation of new SSL * sessions. */ + @Override public boolean getEnableSessionCreation() { return enableSessionCreation; } @@ -288,6 +300,7 @@ /** * Returns the SSLParameters in effect for newly accepted connections. */ + @Override synchronized public SSLParameters getSSLParameters() { SSLParameters params = super.getSSLParameters(); @@ -302,6 +315,7 @@ /** * Applies SSLParameters to newly accepted connections. */ + @Override synchronized public void setSSLParameters(SSLParameters params) { super.setSSLParameters(params); @@ -319,6 +333,7 @@ * information provided in the authentication context which was * presented during construction. */ + @Override public Socket accept() throws IOException { SSLSocketImpl s = new SSLSocketImpl(sslContext, useServerMode, enabledCipherSuites, doClientAuth, enableSessionCreation, @@ -333,6 +348,7 @@ /** * Provides a brief description of this SSL socket. */ + @Override public String toString() { return "[SSL: "+ super.toString() + "]"; }