commit 09f1c724e3eae6d28883b7c16ef6531b556c5691
author Alex Klyubin <klyubin@google.com> Wed Jul 16 15:25:13 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 16 13:12:22 2014 +0000
tree 713498d26ddfabd42975446814a8704899815526
parent 79f5cd1429d37044a48af5d73d2003f43fd99318
parent b56f21270af1d091fa7db988c57e2170bd53f683

Merge "No need to explicitly enable TLS-PSK cipher suites." into lmp-dev

core/java/android/net/PSKKeyManager.java

diff --git a/core/java/android/net/PSKKeyManager.java b/core/java/android/net/PSKKeyManager.java
index 92dd141..e868c4f 100644
--- a/core/java/android/net/PSKKeyManager.java
+++ b/core/java/android/net/PSKKeyManager.java
@@ -81,19 +81,16 @@
  * TLS-PSK in {@code SSLSocket}, {@code SSLServerSocket} and {@code SSLEngine} instances obtained
  * from it.
  * <pre> {@code
- *  PSKKeyManager myPskKeyManager = ...;
+ * PSKKeyManager myPskKeyManager = ...;
  *
  * SSLContext sslContext = SSLContext.getInstance("TLS");
  * sslContext.init(
  *         new KeyManager[] &#123;myPskKeyManager&#125;,
- *         new TrustManager[0], // No TrustManagers needed in TLS-PSK
+ *         new TrustManager[0], // No TrustManagers needed for TLS-PSK
  *         null // Use the default source of entropy
  *         );
  *
  * SSLSocket sslSocket = (SSLSocket) sslContext.getSocketFactory().createSocket(...);
- * // Enable a TLS-PSK cipher suite (no TLS-PSK cipher suites are enabled by default)
- * sslSocket.setEnabledCipherSuites(new String[] &#123;"TLS_PSK_WITH_AES_128_CBC_SHA"&#125;);
- * sslSocket.startHandshake();
  * }</pre>
  */
 public interface PSKKeyManager extends com.android.org.conscrypt.PSKKeyManager {