diff options
| author | Jon Dormody <jond@google.com> | 2017-11-09 16:42:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-09 16:42:19 +0000 |
| commit | 5770dfd1e59bda47e093aabd5fe990d2f3860519 (patch) | |
| tree | 5937315ecfc8eaba764b8adb23d8e32cad256809 /core/java/android | |
| parent | f7c0f2e6bfd97331f9d5653b383d705291d04c59 (diff) | |
| parent | d9696eb356320e8f4bce012f1803a60a08116a1b (diff) | |
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am: 459735662f am: 13e959bbec
am: d9696eb356
Change-Id: I616cd581d38cdae91c53b31325e08919efd92a8c
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 0b1569ca4ff5..4817813cab1b 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -63,7 +63,12 @@ import javax.net.ssl.X509TrustManager; * This implementation does check the server's certificate hostname, but only * for createSocket variants that specify a hostname. When using methods that * use {@link InetAddress} or which return an unconnected socket, you MUST - * verify the server's identity yourself to ensure a secure connection.</p> + * verify the server's identity yourself to ensure a secure connection. + * + * Refer to + * <a href="https://developer.android.com/training/articles/security-gms-provider.html"> + * Updating Your Security Provider to Protect Against SSL Exploits</a> + * for further information.</p> * * <p>One way to verify the server's identity is to use * {@link HttpsURLConnection#getDefaultHostnameVerifier()} to get a |