diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-07-11 14:41:12 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2014-07-14 16:48:50 +0000 |
| commit | b5730a183c0ef94946bb04222f6219f83adef8f5 (patch) | |
| tree | 00596561c2181086d99c9cde817e4d2232b6ed0d /support | |
| parent | 510a147e8b463fc2678aed6ad4f8095cc891eea8 (diff) | |
| download | libcore-b5730a183c0ef94946bb04222f6219f83adef8f5.zip libcore-b5730a183c0ef94946bb04222f6219f83adef8f5.tar.gz libcore-b5730a183c0ef94946bb04222f6219f83adef8f5.tar.bz2 | |
TLS-PSK cipher suites enabled when PSKKeyManager is provided.
This documents and tests that TLS-PSK cipher suites are enabled
if a PSKKeyManager is provided to SSLContext during its
initialization.
Bug: 15073623
Change-Id: I8e2bc3e7a1ea8a986e468973b6bad19dc6b7bc3c
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index 719c3b7..a526c2e 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -863,6 +863,15 @@ public final class StandardNames extends Assert { "SSL_RSA_WITH_RC4_128_SHA", CIPHER_SUITE_SECURE_RENEGOTIATION); + // NOTE: This list needs to be kept in sync with Javadoc of javax.net.ssl.SSLSocket and + // javax.net.ssl.SSLEngine. + public static final List<String> CIPHER_SUITES_DEFAULT_PSK = Arrays.asList( + "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA", + "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA", + "TLS_PSK_WITH_AES_128_CBC_SHA", + "TLS_PSK_WITH_AES_256_CBC_SHA" + ); + private static final Set<String> PERMITTED_DEFAULT_KEY_EXCHANGE_ALGS = new HashSet<String>(Arrays.asList("RSA", "DHE_RSA", |