diff options
| author | 2016-02-01 03:24:03 -0800 | |
|---|---|---|
| committer | 2016-02-01 03:24:05 -0800 | |
| commit | 1c008de8db85eb6b2dfdcbbea562ef7b9da997ff (patch) | |
| tree | 876f2f4d9aace9c1b69c7b03097bfbda8204011d | |
| parent | cdf8bc9449af097cb7d41acb4c6929a985e6dd5f (diff) | |
Track libcore change
Internal master also has test-current.txt which needs the new Java8 SNI
things added to it.
Change-Id: I36ad96ffc57cbcec4f0996e4f9dd390aff260017
| -rw-r--r-- | api/test-current.txt | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 6d9004daf8ae..88ab3d827e94 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -62021,6 +62021,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 { @@ -62093,6 +62094,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(); @@ -62214,12 +62234,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); } @@ -62347,6 +62373,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 { } |