diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-12-13 12:57:12 -0800 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2013-12-13 13:19:17 -0800 |
| commit | d53b56bfef5bade4769170be555cad069a8bde5f (patch) | |
| tree | 7cf3effe734142d856749ec6f776ad6a9fb4c87d /luni/src/main/java/javax/net | |
| parent | 8f498ae3239c6c29f5bdbded9b92711222c57696 (diff) | |
| download | libcore-d53b56bfef5bade4769170be555cad069a8bde5f.zip libcore-d53b56bfef5bade4769170be555cad069a8bde5f.tar.gz libcore-d53b56bfef5bade4769170be555cad069a8bde5f.tar.bz2 | |
Javadoc protocols and providers supported by SSLContext.
Change-Id: I1ceb0d6d2d8c4f90a40865aa375fd7d93ddd4389
Diffstat (limited to 'luni/src/main/java/javax/net')
| -rw-r--r-- | luni/src/main/java/javax/net/ssl/SSLContext.java | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/luni/src/main/java/javax/net/ssl/SSLContext.java b/luni/src/main/java/javax/net/ssl/SSLContext.java index a59f301..ec5f0a8 100644 --- a/luni/src/main/java/javax/net/ssl/SSLContext.java +++ b/luni/src/main/java/javax/net/ssl/SSLContext.java @@ -82,6 +82,46 @@ public class SSLContext { /** * Creates a new {@code SSLContext} instance for the specified protocol. * + * <p>The following protocols are supported: + * <table> + * <thead> + * <tr> + * <th>Protocol</th> + * <th>API Levels</th> + * </tr> + * </thead> + * <tbody> + * <tr> + * <td>Default</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>SSL</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>SSLv3</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>TLS</td> + * <td>1+</td> + * </tr> + * <tr> + * <td>TLSv1</td> + * <td>1+</td> + * </tr> + * <tr> + * <td>TLSv1.1</td> + * <td>16+</td> + * </tr> + * <tr> + * <td>TLSv1.2</td> + * <td>16+</td> + * </tr> + * </tbody> + * </table> + * * @param protocol * the requested protocol to create a context for. * @return the created {@code SSLContext} instance. @@ -103,6 +143,79 @@ public class SSLContext { * Creates a new {@code SSLContext} instance for the specified protocol from * the specified provider. * + * <p>The following combinations are supported: + * <table> + * <thead> + * <tr> + * <th>Protocol</th> + * <th>Provider</th> + * <th>API Levels</th> + * </tr> + * </thead> + * <tbody> + * <tr> + * <td>Default</td> + * <td>AndroidOpenSSL</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>SSL</td> + * <td>AndroidOpenSSL</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>SSL</td> + * <td>HarmonyJSSE</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>SSLv3</td> + * <td>AndroidOpenSSL</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>SSLv3</td> + * <td>HarmonyJSSE</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>TLS</td> + * <td>AndroidOpenSSL</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>TLS</td> + * <td>HarmonyJSSE</td> + * <td>1+</td> + * </tr> + * <tr> + * <td>TLSv1</td> + * <td>AndroidOpenSSL</td> + * <td>9+</td> + * </tr> + * <tr> + * <td>TLSv1</td> + * <td>HarmonyJSSE</td> + * <td>1+</td> + * </tr> + * <tr> + * <td>TLSv1.1</td> + * <td>AndroidOpenSSL</td> + * <td>16+</td> + * </tr> + * <tr> + * <td>TLSv1.2</td> + * <td>AndroidOpenSSL</td> + * <td>16+</td> + * </tr> + * </tbody> + * </table> + * + * <p><strong>NOTE:</strong> The best practice is to rely on platform + * defaults rather than explicitly specify a provider. + * {@link #getDefault()} and {@link #getInstance(String)} are normally + * preferred over this method. + * * @param protocol * the requested protocol to create a context for. * @param provider |