am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs

* commit 'dd8accfe0f3d71a4e6402595fea48bf435a09b65':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
This commit is contained in:
Alex Klyubin
2014-10-31 15:44:35 +00:00
committed by Android Git Automerger

View File

@@ -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