diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-06-19 14:58:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 14:58:57 +0000 |
| commit | 33c1c8c36c62c1238876bddf916bdf92a5654543 (patch) | |
| tree | a39ac500a7fc6ca3f6e1ae0d4e7c279edb8812c7 /support | |
| parent | 3019fd32394a00d61bc05ce4e7cb3c949f6143ee (diff) | |
| parent | e0affcdc8c4513d91352c0fc6f4c5c29b0605d2d (diff) | |
| download | libcore-33c1c8c36c62c1238876bddf916bdf92a5654543.tar.gz libcore-33c1c8c36c62c1238876bddf916bdf92a5654543.tar.bz2 libcore-33c1c8c36c62c1238876bddf916bdf92a5654543.zip | |
am e0affcdc: Merge "Assert the updated list of supported ECDHE-PSK cipher suites."
* commit 'e0affcdc8c4513d91352c0fc6f4c5c29b0605d2d':
Assert the updated list of supported ECDHE-PSK cipher suites.
Diffstat (limited to 'support')
| -rw-r--r-- | support/src/test/java/libcore/java/security/StandardNames.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/support/src/test/java/libcore/java/security/StandardNames.java b/support/src/test/java/libcore/java/security/StandardNames.java index 2090d3bf0..719c3b702 100644 --- a/support/src/test/java/libcore/java/security/StandardNames.java +++ b/support/src/test/java/libcore/java/security/StandardNames.java @@ -717,8 +717,8 @@ public final class StandardNames extends Assert { addOpenSsl("TLS_PSK_WITH_3DES_EDE_CBC_SHA"); addOpenSsl("TLS_PSK_WITH_AES_128_CBC_SHA"); addOpenSsl("TLS_PSK_WITH_AES_256_CBC_SHA"); - addOpenSsl("TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256"); - addOpenSsl("TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384"); + addOpenSsl("TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"); + addOpenSsl("TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"); // RFC 5746's Signaling Cipher Suite Value to indicate a request for secure renegotiation addBoth(CIPHER_SUITE_SECURE_RENEGOTIATION); |