Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 42340b9

* commit '42340b9de03fb2b27a0f915d827d729bce7fcda7':
  Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
This commit is contained in:
Alex Klyubin
2014-11-01 15:00:10 +00:00
committed by android-build-merger
parent fd8184e424 42340b9de0
commit a409cdf161
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/PskKeyManager.java
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