summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-06-02 13:27:06 -0700
committerKenny Root <kroot@google.com>2015-06-02 17:01:29 -0700
commit8bba6292604e7ea3a45449b11c53e7660259956d (patch)
treefedc572c45d5fb00258111ea6ac514ec543a74b4 /src
parent4f05b238eec1f3f026657a6da19058143d34ceaa (diff)
downloadexternal_boringssl-8bba6292604e7ea3a45449b11c53e7660259956d.zip
external_boringssl-8bba6292604e7ea3a45449b11c53e7660259956d.tar.gz
external_boringssl-8bba6292604e7ea3a45449b11c53e7660259956d.tar.bz2
Disable 0xcafe cipher suite (PSK with AES-GCM).
This is a non-standard cipher suite that's not used in the Android system. (cherry picked from commit 0d4deb2be14e6590f332920f62b84ef04d153ed1) Bug: 21522548 Change-Id: I07a2783965e9e891473327c9039583b4f89e9f27
Diffstat (limited to 'src')
-rw-r--r--src/ssl/s3_lib.c2
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,