diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-10-31 15:44:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 15:44:35 +0000 |
| commit | 8129b8b471e782708be945e40fa82d2c20ebceef (patch) | |
| tree | ca9d858ba2265c334cbaad9cc832a54d49359892 | |
| parent | bdb1cf0c1bed1ae32d98c1efb269b87c9797182d (diff) | |
| parent | dd8accfe0f3d71a4e6402595fea48bf435a09b65 (diff) | |
| download | frameworks_base-8129b8b471e782708be945e40fa82d2c20ebceef.zip frameworks_base-8129b8b471e782708be945e40fa82d2c20ebceef.tar.gz frameworks_base-8129b8b471e782708be945e40fa82d2c20ebceef.tar.bz2 | |
am dd8accfe: Merge "Mention ECDHE_PSK bug in Javadoc of PskKeyManager." into lmp-docs
* commit 'dd8accfe0f3d71a4e6402595fea48bf435a09b65':
Mention ECDHE_PSK bug in Javadoc of PskKeyManager.
| -rw-r--r-- | core/java/android/net/PskKeyManager.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/net/PskKeyManager.java b/core/java/android/net/PskKeyManager.java index d162282..f82e635 100644 --- a/core/java/android/net/PskKeyManager.java +++ b/core/java/android/net/PskKeyManager.java @@ -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 |