diff options
| author | Adam Langley <agl@google.com> | 2015-10-30 13:15:30 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-10-30 13:39:01 -0700 |
| commit | fdeb488e6332a17729db5a04236e48a46a019272 (patch) | |
| tree | b4e43f0c1d2161af97e2b7e030644ca1d54a839c /src/tool/speed.cc | |
| parent | 6e19d4dc059301bed57d7dae7750c69fecb51b15 (diff) | |
| download | external_boringssl-fdeb488e6332a17729db5a04236e48a46a019272.zip external_boringssl-fdeb488e6332a17729db5a04236e48a46a019272.tar.gz external_boringssl-fdeb488e6332a17729db5a04236e48a46a019272.tar.bz2 | |
external/boringssl: sync with upstream.
See the following URL for a list of the changes included in this sync:
https://boringssl.googlesource.com/boringssl/+log/d98dc1311e20193ac188e359e91aeaaf5cc3a7e2..51a01a5cd44b3bdfab5220847000f13fc85f000b
Change-Id: I36535827f652536dfd687c1646bbea1535fc8e44
Diffstat (limited to 'src/tool/speed.cc')
| -rw-r--r-- | src/tool/speed.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tool/speed.cc b/src/tool/speed.cc index 307b0b9..39bbadb 100644 --- a/src/tool/speed.cc +++ b/src/tool/speed.cc @@ -458,8 +458,10 @@ bool Speed(const std::vector<std::string> &args) { if (!SpeedAEAD(EVP_aead_aes_128_gcm(), "AES-128-GCM", kTLSADLen, selected) || !SpeedAEAD(EVP_aead_aes_256_gcm(), "AES-256-GCM", kTLSADLen, selected) || - !SpeedAEAD(EVP_aead_chacha20_poly1305(), "ChaCha20-Poly1305", kTLSADLen, - selected) || + !SpeedAEAD(EVP_aead_chacha20_poly1305_rfc7539(), "ChaCha20-Poly1305", + kTLSADLen, selected) || + !SpeedAEAD(EVP_aead_chacha20_poly1305_old(), "ChaCha20-Poly1305-Old", + kTLSADLen, selected) || !SpeedAEAD(EVP_aead_rc4_md5_tls(), "RC4-MD5", kLegacyADLen, selected) || !SpeedAEAD(EVP_aead_aes_128_cbc_sha1_tls(), "AES-128-CBC-SHA1", kLegacyADLen, selected) || |