diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 0825c64..974aa6c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12750,9 +12750,11 @@ package android.net { method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache); method public byte[] getNpnSelectedProtocol(java.net.Socket); method public java.lang.String[] getSupportedCipherSuites(); + method public void setHostname(java.net.Socket, java.lang.String); method public void setKeyManagers(javax.net.ssl.KeyManager[]); method public void setNpnProtocols(byte[][]); method public void setTrustManagers(javax.net.ssl.TrustManager[]); + method public void setUseSessionTickets(java.net.Socket, boolean); } public final class SSLSessionCache { diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 2703f1d..27cabef 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -300,9 +300,10 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * null if no protocol was negotiated. * * @param socket a socket created by this factory. + * @throws IllegalArgumentException if the socket was not created by this factory. */ public byte[] getNpnSelectedProtocol(Socket socket) { - return ((OpenSSLSocketImpl) socket).getNpnSelectedProtocol(); + return castToOpenSSLSocket(socket).getNpnSelectedProtocol(); } /** @@ -316,6 +317,38 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { mInsecureFactory = null; } + /** + * Enables <a href="http://tools.ietf.org/html/rfc5077#section-3.2">session ticket</a> + * support on the given socket. + * + * @param socket a socket created by this factory + * @param useSessionTickets {@code true} to enable session ticket support on this socket. + * @throws IllegalArgumentException if the socket was not created by this factory. + */ + public void setUseSessionTickets(Socket socket, boolean useSessionTickets) { + castToOpenSSLSocket(socket).setUseSessionTickets(useSessionTickets); + } + + /** + * Turns on <a href="http://tools.ietf.org/html/rfc6066#section-3">Server + * Name Indication (SNI)</a> on a given socket. + * + * @param socket a socket created by this factory. + * @param hostName the desired SNI hostname, null to disable. + * @throws IllegalArgumentException if the socket was not created by this factory. + */ + public void setHostname(Socket socket, String hostName) { + castToOpenSSLSocket(socket).setHostname(hostName); + } + + private static OpenSSLSocketImpl castToOpenSSLSocket(Socket socket) { + if (!(socket instanceof OpenSSLSocketImpl)) { + throw new IllegalArgumentException("Socket not created by this factory: " + + socket); + } + + return (OpenSSLSocketImpl) socket; + } /** * {@inheritDoc} |