diff options
| author | Adam Langley <agl@google.com> | 2015-06-03 00:17:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-03 00:17:53 +0000 |
| commit | 82ea518198c8ce74418c90597ccf8f444d1154ab (patch) | |
| tree | fedc572c45d5fb00258111ea6ac514ec543a74b4 | |
| parent | 15bef6eaa430acbc56f5e11cf98adbf7e8956ff6 (diff) | |
| parent | 8bba6292604e7ea3a45449b11c53e7660259956d (diff) | |
| download | external_boringssl-82ea518198c8ce74418c90597ccf8f444d1154ab.zip external_boringssl-82ea518198c8ce74418c90597ccf8f444d1154ab.tar.gz external_boringssl-82ea518198c8ce74418c90597ccf8f444d1154ab.tar.bz2 | |
am 8bba6292: Disable 0xcafe cipher suite (PSK with AES-GCM).
* commit '8bba6292604e7ea3a45449b11c53e7660259956d':
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, |