diff options
| author | Adam Langley <agl@google.com> | 2015-06-15 23:01:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 23:01:56 +0000 |
| commit | 6d66cf824e4695a07996cb1256e3d3fd06fc2c36 (patch) | |
| tree | ecf049c0e56fdf2b7d414b2fcafa8b190b65e2cd /src/ssl/ssl_cipher.c | |
| parent | 1f76c1381df635b46e93b4a592b1024a4418be24 (diff) | |
| parent | 4bae3aba0494da7c4e3c1b28ff978eb38e6323e6 (diff) | |
| download | external_boringssl-6d66cf824e4695a07996cb1256e3d3fd06fc2c36.zip external_boringssl-6d66cf824e4695a07996cb1256e3d3fd06fc2c36.tar.gz external_boringssl-6d66cf824e4695a07996cb1256e3d3fd06fc2c36.tar.bz2 | |
am 4bae3aba: Drop ECDHE-PSK-AES-128-GCM.
* commit '4bae3aba0494da7c4e3c1b28ff978eb38e6323e6':
Drop ECDHE-PSK-AES-128-GCM.
Diffstat (limited to 'src/ssl/ssl_cipher.c')
| -rw-r--r-- | src/ssl/ssl_cipher.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/ssl/ssl_cipher.c b/src/ssl/ssl_cipher.c index 5e617b1..2f1548a 100644 --- a/src/ssl/ssl_cipher.c +++ b/src/ssl/ssl_cipher.c @@ -429,20 +429,7 @@ const SSL_CIPHER kCiphers[] = { 256, 256, }, - #if !defined(ANDROID) - /* ECDH PSK ciphersuites */ - - /* Cipher CAFE */ - { - TLS1_TXT_ECDHE_PSK_WITH_AES_128_GCM_SHA256, - TLS1_CK_ECDHE_PSK_WITH_AES_128_GCM_SHA256, SSL_kECDHE, SSL_aPSK, - SSL_AES128GCM, SSL_AEAD, SSL_TLSV1_2, SSL_HIGH, - SSL_HANDSHAKE_MAC_SHA256 | - SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_INCLUDED_IN_RECORD, - 128, 128, - }, - { TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305, TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305, SSL_kECDHE, SSL_aRSA, |