diff options
| author | David Benjamin <davidben@chromium.org> | 2015-12-01 02:48:18 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-12-17 00:22:11 +0300 |
| commit | 8ffab7268380fd97236a323ccbf992642861a8e2 (patch) | |
| tree | d16eb1ff8d9b8a41c563746e75556040ad07ecc3 /tool | |
| parent | fef6fb592bb8277a555818c4152c9ebfcf9e5533 (diff) | |
Point EVP_aead_chacha20_poly1305 at the standardized version.
The consumers have all been updated, so we can move EVP_aead_chacha20_poly1305
to its final state. Unfortunately, the _rfc7539-suffixed version will need to
stick around for just a hair longer. Also the tls1.h macros, but the remaining
consumers are okay with that changing underneath them.
Change-Id: Ibbb70ec1860d6ac6a7e1d7b45e70fe692bf5ebe5
Reviewed-on: https://boringssl-review.googlesource.com/6600
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/speed.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/speed.cc b/tool/speed.cc index 54f3c75e..a14099fc 100644 --- a/tool/speed.cc +++ b/tool/speed.cc @@ -530,8 +530,8 @@ 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_rfc7539(), "ChaCha20-Poly1305", - kTLSADLen, selected) || + !SpeedAEAD(EVP_aead_chacha20_poly1305(), "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) || |