Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 193bc6d6 authored by Ben Komalo's avatar Ben Komalo
Browse files

Open up setKeyManager/setTrustManager. 

The improved keystore will allow clients (Email not the least of them)
to establish SSL connections using custom client certificates. In order
to do this properly, the socket factories they use to establish these
connections need to be able to customize their behavior.

Change-Id: I6e0fa04dd01bd6481dfdad5a71a63e0371d0ad8c
parent 622d5441

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -11180,6 +11180,8 @@ package android.net { 
    method public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

    method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache);

    method public java.lang.String[] getSupportedCipherSuites();

    method public void setKeyManagers(javax.net.ssl.KeyManager[]);

    method public void setTrustManagers(javax.net.ssl.TrustManager[]);

  }















  public final class SSLSessionCache {

























core/java/android/net/SSLCertificateSocketFactory.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -240,7 +240,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {





























    /**















     * Sets the {@link TrustManager}s to be used for connections made by this factory.













     * @hide















     */















    public void setTrustManagers(TrustManager[] trustManager) {















        mTrustManagers = trustManager;









@@ -253,7 +252,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {





























    /**















     * Sets the {@link KeyManager}s to be used for connections made by this factory.













     * @hide















     */















    public void setKeyManagers(KeyManager[] keyManagers) {















        mKeyManagers = keyManagers;