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 | f7fe69bb92ec196fc97ab65f678de993e00e41b7 (patch) | |
| tree | 179de31d373d518d1e129eca1d63a2974c999fe7 /src/ssl/test/runner/cipher_suites.go | |
| parent | 6d66cf824e4695a07996cb1256e3d3fd06fc2c36 (diff) | |
| parent | dfb3ba68fd0011cba7d8e4c1a46295099fef85bf (diff) | |
| download | external_boringssl-f7fe69bb92ec196fc97ab65f678de993e00e41b7.zip external_boringssl-f7fe69bb92ec196fc97ab65f678de993e00e41b7.tar.gz external_boringssl-f7fe69bb92ec196fc97ab65f678de993e00e41b7.tar.bz2 | |
am dfb3ba68: Add ECDHE-PSK-AES{128,256}-SHA cipher suites.
* commit 'dfb3ba68fd0011cba7d8e4c1a46295099fef85bf':
Add ECDHE-PSK-AES{128,256}-SHA cipher suites.
Diffstat (limited to 'src/ssl/test/runner/cipher_suites.go')
| -rw-r--r-- | src/ssl/test/runner/cipher_suites.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ssl/test/runner/cipher_suites.go b/src/ssl/test/runner/cipher_suites.go index 162c0c0..70c7262 100644 --- a/src/ssl/test/runner/cipher_suites.go +++ b/src/ssl/test/runner/cipher_suites.go @@ -124,6 +124,8 @@ var cipherSuites = []*cipherSuite{ {TLS_PSK_WITH_RC4_128_SHA, 16, 20, 0, pskKA, suiteNoDTLS | suitePSK, cipherRC4, macSHA1, nil}, {TLS_PSK_WITH_AES_128_CBC_SHA, 16, 20, 16, pskKA, suitePSK, cipherAES, macSHA1, nil}, {TLS_PSK_WITH_AES_256_CBC_SHA, 32, 20, 16, pskKA, suitePSK, cipherAES, macSHA1, nil}, + {TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA, 16, 20, 16, ecdhePSKKA, suiteECDHE | suitePSK, cipherAES, macSHA1, nil}, + {TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA, 32, 20, 16, ecdhePSKKA, suiteECDHE | suitePSK, cipherAES, macSHA1, nil}, } func cipherRC4(key, iv []byte, isRead bool) interface{} { @@ -402,6 +404,8 @@ const ( TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 uint16 = 0xc02c TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 uint16 = 0xc02f TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 uint16 = 0xc030 + TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA uint16 = 0xc035 + TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA uint16 = 0xc036 fallbackSCSV uint16 = 0x5600 ) |