diff options
| author | Adam Langley <agl@google.com> | 2015-06-03 00:32:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-03 00:32:18 +0000 |
| commit | 312dd001039153e13d384af6a3efddcdcf477cc9 (patch) | |
| tree | 980ced8892d457027673bffb97ff17dfffba81d8 | |
| parent | ee9c8ea6e2309a7e2d6afe113cf9b7de10599389 (diff) | |
| parent | 0d4deb2be14e6590f332920f62b84ef04d153ed1 (diff) | |
| download | external_boringssl-312dd001039153e13d384af6a3efddcdcf477cc9.zip external_boringssl-312dd001039153e13d384af6a3efddcdcf477cc9.tar.gz external_boringssl-312dd001039153e13d384af6a3efddcdcf477cc9.tar.bz2 | |
am 0d4deb2b: Disable 0xcafe cipher suite (PSK with AES-GCM).
* commit '0d4deb2be14e6590f332920f62b84ef04d153ed1':
Disable 0xcafe cipher suite (PSK with AES-GCM).
| -rw-r--r-- | src/ssl/s3_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ssl/s3_lib.c b/src/ssl/s3_lib.c index 13a4a19..92c923e 100644 --- a/src/ssl/s3_lib.c +++ b/src/ssl/s3_lib.c @@ -443,6 +443,7 @@ const SSL_CIPHER ssl3_ciphers[] = { /* ECDH PSK ciphersuites */ /* Cipher CAFE */ +#if !defined(ANDROID) { TLS1_TXT_ECDHE_PSK_WITH_AES_128_GCM_SHA256, TLS1_CK_ECDHE_PSK_WITH_AES_128_GCM_SHA256, SSL_kECDHE, SSL_aPSK, @@ -452,7 +453,6 @@ const SSL_CIPHER ssl3_ciphers[] = { 128, 128, }, -#if !defined(ANDROID) { TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305, TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305, SSL_kECDHE, SSL_aRSA, |