diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-07-15 15:53:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-15 15:53:45 +0000 |
| commit | c51bba09dff12cfffc9c5a30b83a2b5f9fd745e4 (patch) | |
| tree | df0d2e3f54fc3fc5f9dc2ec43da0eb3227a32600 /support | |
| parent | 7963eff89ef3600db4f8c936563a885fa4ef2b23 (diff) | |
| parent | ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3 (diff) | |
| download | libcore-c51bba09dff12cfffc9c5a30b83a2b5f9fd745e4.zip libcore-c51bba09dff12cfffc9c5a30b83a2b5f9fd745e4.tar.gz libcore-c51bba09dff12cfffc9c5a30b83a2b5f9fd745e4.tar.bz2 | |
am ea43fa14: Merge "TLS-PSK cipher suites enabled when PSKKeyManager is provided."
* commit 'ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3':
TLS-PSK cipher suites enabled when PSKKeyManager is provided.
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", |