diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-06-19 15:07:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 15:07:45 +0000 |
| commit | 82707939a18795af3311b8661c2e3651a89e205b (patch) | |
| tree | 0c80b984a507cd6016ab8580f587a95e209b1757 /support/src | |
| parent | 3b9d704b6ed8668493a1246a9ea1bc30fa8a2e2b (diff) | |
| parent | 33c1c8c36c62c1238876bddf916bdf92a5654543 (diff) | |
| download | libcore-82707939a18795af3311b8661c2e3651a89e205b.zip libcore-82707939a18795af3311b8661c2e3651a89e205b.tar.gz libcore-82707939a18795af3311b8661c2e3651a89e205b.tar.bz2 | |
am 33c1c8c3: am e0affcdc: Merge "Assert the updated list of supported ECDHE-PSK cipher suites."
* commit '33c1c8c36c62c1238876bddf916bdf92a5654543':
Assert the updated list of supported ECDHE-PSK cipher suites.
Diffstat (limited to 'support/src')
| -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 2090d3b..719c3b7 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); |