diff options
| author | Kenny Root <kroot@google.com> | 2014-05-06 22:11:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 22:11:24 +0000 |
| commit | dd3a144c3ca474eb6afd8f8f0ad7118658808d88 (patch) | |
| tree | a2ec7da6bbe2cea1805cb1f8d2cbeaabef003766 /api | |
| parent | c5694ab534d522e733d08e8b10ae8b044febaf9a (diff) | |
| parent | 2cfedd94b334dea395ba1a103827386123b229a5 (diff) | |
| download | frameworks_base-dd3a144c3ca474eb6afd8f8f0ad7118658808d88.zip frameworks_base-dd3a144c3ca474eb6afd8f8f0ad7118658808d88.tar.gz frameworks_base-dd3a144c3ca474eb6afd8f8f0ad7118658808d88.tar.bz2 | |
am 1b9c2108: Unhide new SSL APIs
* commit '1b9c2108e8fdd5344e3916259f9d1eb3d2227a50':
Unhide new SSL APIs
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index f4fa359..113874d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -49881,6 +49881,7 @@ package javax.net.ssl { method public abstract boolean getEnableSessionCreation(); method public abstract java.lang.String[] getEnabledCipherSuites(); method public abstract java.lang.String[] getEnabledProtocols(); + method public javax.net.ssl.SSLSession getHandshakeSession(); method public abstract javax.net.ssl.SSLEngineResult.HandshakeStatus getHandshakeStatus(); method public abstract boolean getNeedClientAuth(); method public java.lang.String getPeerHost(); @@ -49954,10 +49955,12 @@ package javax.net.ssl { ctor public SSLParameters(java.lang.String[]); ctor public SSLParameters(java.lang.String[], java.lang.String[]); method public java.lang.String[] getCipherSuites(); + method public java.lang.String getEndpointIdentificationAlgorithm(); method public boolean getNeedClientAuth(); method public java.lang.String[] getProtocols(); method public boolean getWantClientAuth(); 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 void setWantClientAuth(boolean); @@ -50058,6 +50061,7 @@ package javax.net.ssl { method public abstract boolean getEnableSessionCreation(); method public abstract java.lang.String[] getEnabledCipherSuites(); method public abstract java.lang.String[] getEnabledProtocols(); + method public javax.net.ssl.SSLSession getHandshakeSession(); method public abstract boolean getNeedClientAuth(); method public javax.net.ssl.SSLParameters getSSLParameters(); method public abstract javax.net.ssl.SSLSession getSession(); @@ -50113,6 +50117,14 @@ package javax.net.ssl { method public java.lang.String chooseEngineServerAlias(java.lang.String, java.security.Principal[], javax.net.ssl.SSLEngine); } + public abstract class X509ExtendedTrustManager implements javax.net.ssl.X509TrustManager { + ctor public X509ExtendedTrustManager(); + method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException; + method public abstract void checkClientTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException; + method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, java.net.Socket) throws java.security.cert.CertificateException; + method public abstract void checkServerTrusted(java.security.cert.X509Certificate[], java.lang.String, javax.net.ssl.SSLEngine) throws java.security.cert.CertificateException; + } + public abstract interface X509KeyManager implements javax.net.ssl.KeyManager { method public abstract java.lang.String chooseClientAlias(java.lang.String[], java.security.Principal[], java.net.Socket); method public abstract java.lang.String chooseServerAlias(java.lang.String, java.security.Principal[], java.net.Socket); |