From 542349a99542bfc9af1c6a0eb1ff1cc411c30792 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 15 Jan 2016 15:10:02 -0800 Subject: [PATCH 1/2] Track libcore change This tracks libcore change I23b85308ac25fd00307d37cff1d93ee6c2bfba98 which adds SNI support. Change-Id: I93d8a4b07cc1f599123565a5c0672dd7848f05bf --- api/current.txt | 28 ++++++++++++++++++++++++++++ api/system-current.txt | 28 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/api/current.txt b/api/current.txt index 18c5c16082069..5268421b64429 100644 --- a/api/current.txt +++ b/api/current.txt @@ -60025,6 +60025,7 @@ package javax.net.ssl { ctor public ExtendedSSLSession(); method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms(); method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms(); + method public java.util.List getRequestedServerNames(); } public class HandshakeCompletedEvent extends java.util.EventObject { @@ -60097,6 +60098,25 @@ package javax.net.ssl { public abstract interface ManagerFactoryParameters { } + public final class SNIHostName extends javax.net.ssl.SNIServerName { + ctor public SNIHostName(java.lang.String); + ctor public SNIHostName(byte[]); + method public static javax.net.ssl.SNIMatcher createSNIMatcher(java.lang.String); + method public java.lang.String getAsciiName(); + } + + public abstract class SNIMatcher { + ctor protected SNIMatcher(int); + method public final int getType(); + method public abstract boolean matches(javax.net.ssl.SNIServerName); + } + + public abstract class SNIServerName { + ctor protected SNIServerName(int, byte[]); + method public final byte[] getEncoded(); + method public final int getType(); + } + public class SSLContext { ctor protected SSLContext(javax.net.ssl.SSLContextSpi, java.security.Provider, java.lang.String); method public final javax.net.ssl.SSLEngine createSSLEngine(); @@ -60218,12 +60238,16 @@ package javax.net.ssl { method public java.lang.String getEndpointIdentificationAlgorithm(); method public boolean getNeedClientAuth(); method public java.lang.String[] getProtocols(); + method public final java.util.Collection getSNIMatchers(); + method public final java.util.List getServerNames(); method public boolean getWantClientAuth(); method public void setAlgorithmConstraints(java.security.AlgorithmConstraints); method public void setCipherSuites(java.lang.String[]); method public void setEndpointIdentificationAlgorithm(java.lang.String); method public void setNeedClientAuth(boolean); method public void setProtocols(java.lang.String[]); + method public final void setSNIMatchers(java.util.Collection); + method public final void setServerNames(java.util.List); method public void setWantClientAuth(boolean); } @@ -60351,6 +60375,10 @@ package javax.net.ssl { method public abstract java.lang.String[] getSupportedCipherSuites(); } + public final class StandardConstants { + field public static final int SNI_HOST_NAME = 0; // 0x0 + } + public abstract interface TrustManager { } diff --git a/api/system-current.txt b/api/system-current.txt index 523ef072b1206..b61ceb877e42b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -62643,6 +62643,7 @@ package javax.net.ssl { ctor public ExtendedSSLSession(); method public abstract java.lang.String[] getLocalSupportedSignatureAlgorithms(); method public abstract java.lang.String[] getPeerSupportedSignatureAlgorithms(); + method public java.util.List getRequestedServerNames(); } public class HandshakeCompletedEvent extends java.util.EventObject { @@ -62715,6 +62716,25 @@ package javax.net.ssl { public abstract interface ManagerFactoryParameters { } + public final class SNIHostName extends javax.net.ssl.SNIServerName { + ctor public SNIHostName(java.lang.String); + ctor public SNIHostName(byte[]); + method public static javax.net.ssl.SNIMatcher createSNIMatcher(java.lang.String); + method public java.lang.String getAsciiName(); + } + + public abstract class SNIMatcher { + ctor protected SNIMatcher(int); + method public final int getType(); + method public abstract boolean matches(javax.net.ssl.SNIServerName); + } + + public abstract class SNIServerName { + ctor protected SNIServerName(int, byte[]); + method public final byte[] getEncoded(); + method public final int getType(); + } + public class SSLContext { ctor protected SSLContext(javax.net.ssl.SSLContextSpi, java.security.Provider, java.lang.String); method public final javax.net.ssl.SSLEngine createSSLEngine(); @@ -62836,12 +62856,16 @@ package javax.net.ssl { method public java.lang.String getEndpointIdentificationAlgorithm(); method public boolean getNeedClientAuth(); method public java.lang.String[] getProtocols(); + method public final java.util.Collection getSNIMatchers(); + method public final java.util.List getServerNames(); method public boolean getWantClientAuth(); method public void setAlgorithmConstraints(java.security.AlgorithmConstraints); method public void setCipherSuites(java.lang.String[]); method public void setEndpointIdentificationAlgorithm(java.lang.String); method public void setNeedClientAuth(boolean); method public void setProtocols(java.lang.String[]); + method public final void setSNIMatchers(java.util.Collection); + method public final void setServerNames(java.util.List); method public void setWantClientAuth(boolean); } @@ -62969,6 +62993,10 @@ package javax.net.ssl { method public abstract java.lang.String[] getSupportedCipherSuites(); } + public final class StandardConstants { + field public static final int SNI_HOST_NAME = 0; // 0x0 + } + public abstract interface TrustManager { } From 779efda7691b885ae072ea0ba9824dacc6e82338 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 15 Jan 2016 15:10:02 -0800 Subject: [PATCH 2/2] Track libcore change This tracks libcore change I5972095a2b51da50249016fda11ed4c046af4211 which adds honor-cipher-suite-ordering API. Change-Id: I7f17e42561c76b4c0a3f451d1126458480c90273 --- api/current.txt | 2 ++ api/system-current.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/api/current.txt b/api/current.txt index 5268421b64429..6969210dbe3d9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -60240,6 +60240,7 @@ package javax.net.ssl { method public java.lang.String[] getProtocols(); method public final java.util.Collection getSNIMatchers(); method public final java.util.List getServerNames(); + method public final boolean getUseCipherSuitesOrder(); method public boolean getWantClientAuth(); method public void setAlgorithmConstraints(java.security.AlgorithmConstraints); method public void setCipherSuites(java.lang.String[]); @@ -60248,6 +60249,7 @@ package javax.net.ssl { method public void setProtocols(java.lang.String[]); method public final void setSNIMatchers(java.util.Collection); method public final void setServerNames(java.util.List); + method public final void setUseCipherSuitesOrder(boolean); method public void setWantClientAuth(boolean); } diff --git a/api/system-current.txt b/api/system-current.txt index b61ceb877e42b..bf6d1a294ccce 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -62858,6 +62858,7 @@ package javax.net.ssl { method public java.lang.String[] getProtocols(); method public final java.util.Collection getSNIMatchers(); method public final java.util.List getServerNames(); + method public final boolean getUseCipherSuitesOrder(); method public boolean getWantClientAuth(); method public void setAlgorithmConstraints(java.security.AlgorithmConstraints); method public void setCipherSuites(java.lang.String[]); @@ -62866,6 +62867,7 @@ package javax.net.ssl { method public void setProtocols(java.lang.String[]); method public final void setSNIMatchers(java.util.Collection); method public final void setServerNames(java.util.List); + method public final void setUseCipherSuitesOrder(boolean); method public void setWantClientAuth(boolean); }