diff options
| author | Adam Langley <alangley@gmail.com> | 2015-10-27 18:37:59 +0300 |
|---|---|---|
| committer | Adam Langley <alangley@gmail.com> | 2015-10-27 19:39:12 +0300 |
| commit | 5dbdad9c33ed9dfee4c612398b6e997983580e58 (patch) | |
| tree | 81659c62328c46a6a6209c6b47fe06fdd55305a1 /tool | |
| parent | f0523e9f2046a249210c6dd86fdcbe069ea9912d (diff) | |
For now, give the unsuffixed ChaCha20 AEAD name to the old version.
QUIC has a complex relationship with BoringSSL owing to it living both
in Chromium and the Google-internal repository. In order for it to
handle the ChaCha20-Poly1305 AEAD switch more easily this change gives
the unsuffixed name to the old AEAD, for now.
Once QUIC has moved to the “_old” version the unsuffixed name can be
given to the new version.
Change-Id: Id8a77be6e3fe2358d78e022413fe088e5a274dca
Reviewed-on: https://boringssl-review.googlesource.com/6361
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <alangley@gmail.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 31c07ac8..39bbadb9 100644 --- a/tool/speed.cc +++ b/tool/speed.cc @@ -458,8 +458,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(), "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) || |