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

Commit a409cdf1 authored by Alex Klyubin's avatar Alex Klyubin Committed by android-build-merger
Browse files

am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc... 

am dcf5af38: am 8129b8b4: am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs automerge: 2f1c76f0
automerge: 42340b9d

* commit '42340b9d':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
parents fd8184e4 42340b9d

core/java/android/net/PskKeyManager.java

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ import javax.net.ssl.SSLEngine; 
 * Subclasses should normally provide their own implementation of {@code getKey} because the default

 * implementation returns no key, which aborts the handshake.

 *

 * <h3>Known issues</h3>

 * The implementation of {@code ECDHE_PSK} cipher suites in API Level 21 contains a bug which breaks

 * compatibility with other implementations. {@code ECDHE_PSK} cipher suites are enabled by default

 * on platforms with API Level 21 when an {@code SSLContext} is initialized with a

 * {@code PskKeyManager}. A workaround is to disable {@code ECDHE_PSK} cipher suites on platforms

 * with API Level 21.

 *

 * <h3>Example</h3>

 * The following example illustrates how to create an {@code SSLContext} which enables the use of

 * TLS-PSK in {@code SSLSocket}, {@code SSLServerSocket} and {@code SSLEngine} instances obtained