Merge changes from topic \'sni\' am: c76789d35a (cdf8bc94) · Commits · e / os / android_frameworks_base

api/current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -62004,6 +62004,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<javax.net.ssl.SNIServerName> getRequestedServerNames();
		}

		public class HandshakeCompletedEvent extends java.util.EventObject {
		@@ -62076,6 +62077,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();
		@@ -62197,12 +62217,18 @@ 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<javax.net.ssl.SNIMatcher> getSNIMatchers();
		method public final java.util.List<javax.net.ssl.SNIServerName> getServerNames();
		method public final boolean getUseCipherSuitesOrder();
		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<javax.net.ssl.SNIMatcher>);
		method public final void setServerNames(java.util.List<javax.net.ssl.SNIServerName>);
		method public final void setUseCipherSuitesOrder(boolean);
		method public void setWantClientAuth(boolean);
		}

		@@ -62330,6 +62356,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 {
		}

api/system-current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -64757,6 +64757,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<javax.net.ssl.SNIServerName> getRequestedServerNames();
		}

		public class HandshakeCompletedEvent extends java.util.EventObject {
		@@ -64829,6 +64830,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();
		@@ -64950,12 +64970,18 @@ 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<javax.net.ssl.SNIMatcher> getSNIMatchers();
		method public final java.util.List<javax.net.ssl.SNIServerName> getServerNames();
		method public final boolean getUseCipherSuitesOrder();
		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<javax.net.ssl.SNIMatcher>);
		method public final void setServerNames(java.util.List<javax.net.ssl.SNIServerName>);
		method public final void setUseCipherSuitesOrder(boolean);
		method public void setWantClientAuth(boolean);
		}

		@@ -65083,6 +65109,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 {
		}