diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-07-15 15:48:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-14 22:46:47 +0000 |
| commit | ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3 (patch) | |
| tree | 353faf4a086208cc96f84ebe32ffd86cf5d22546 /support/src | |
| parent | 13c5b02a87e3ad0fdc32b44a45bbb77680e213b0 (diff) | |
| parent | b5730a183c0ef94946bb04222f6219f83adef8f5 (diff) | |
| download | libcore-ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3.zip libcore-ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3.tar.gz libcore-ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3.tar.bz2 | |
Merge "TLS-PSK cipher suites enabled when PSKKeyManager is provided."
Diffstat (limited to 'support/src')
| -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", |