diff options
| author | David Benjamin <davidben@google.com> | 2018-05-21 17:14:05 -0400 |
|---|---|---|
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2018-05-21 23:08:46 +0000 |
| commit | c93724b530afe285403a6fd5a57f849a0c6061a6 (patch) | |
| tree | 08e91ca8c91f2f67b4dd9004dec8d58709591e20 /tool | |
| parent | fee8709f691f7a35070a76cb38b7dca6116e7687 (diff) | |
| download | boringssl-c93724b530afe285403a6fd5a57f849a0c6061a6.zip boringssl-c93724b530afe285403a6fd5a57f849a0c6061a6.tar.gz boringssl-c93724b530afe285403a6fd5a57f849a0c6061a6.tar.bz2 | |
Benchmark TLS AES-CBC ciphers in both directions.
Between CBC being only parallelizable in one direction, bsaes vs vpaes,
and the Lucky 13 fix, seal and open look very different here. Benchmark
both directions.
Change-Id: I9266ab2800adc29dbeee0ca74502addb92409e23
Reviewed-on: https://boringssl-review.googlesource.com/28644
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/speed.cc | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/tool/speed.cc b/tool/speed.cc index ed3484a..2175baa 100644 --- a/tool/speed.cc +++ b/tool/speed.cc @@ -308,7 +308,8 @@ static bool SpeedAEADChunk(const EVP_AEAD *aead, const std::string &name, // non-scattering seal, hence we add overhead_len to the size of this buffer. std::unique_ptr<uint8_t[]> out_storage( new uint8_t[chunk_len + overhead_len + kAlignment]); - std::unique_ptr<uint8_t[]> in2_storage(new uint8_t[chunk_len + kAlignment]); + std::unique_ptr<uint8_t[]> in2_storage( + new uint8_t[chunk_len + overhead_len + kAlignment]); std::unique_ptr<uint8_t[]> ad(new uint8_t[ad_len]); OPENSSL_memset(ad.get(), 0, ad_len); std::unique_ptr<uint8_t[]> tag_storage( @@ -351,15 +352,25 @@ static bool SpeedAEADChunk(const EVP_AEAD *aead, const std::string &name, EVP_AEAD_CTX_seal(ctx.get(), out, &out_len, chunk_len + overhead_len, nonce.get(), nonce_len, in, chunk_len, ad.get(), ad_len); + ctx.Reset(); + if (!EVP_AEAD_CTX_init_with_direction(ctx.get(), aead, key.get(), key_len, + EVP_AEAD_DEFAULT_TAG_LENGTH, + evp_aead_open)) { + fprintf(stderr, "Failed to create EVP_AEAD_CTX.\n"); + ERR_print_errors_fp(stderr); + return false; + } + if (!TimeFunction(&results, - [chunk_len, nonce_len, ad_len, in2, out, out_len, &ctx, - &nonce, &ad]() -> bool { + [chunk_len, overhead_len, nonce_len, ad_len, in2, out, + out_len, &ctx, &nonce, &ad]() -> bool { size_t in2_len; // N.B. EVP_AEAD_CTX_open_gather is not implemented for // all AEADs. - return EVP_AEAD_CTX_open( - ctx.get(), in2, &in2_len, chunk_len, nonce.get(), - nonce_len, out, out_len, ad.get(), ad_len); + return EVP_AEAD_CTX_open(ctx.get(), in2, &in2_len, + chunk_len + overhead_len, + nonce.get(), nonce_len, out, + out_len, ad.get(), ad_len); })) { fprintf(stderr, "EVP_AEAD_CTX_open failed.\n"); ERR_print_errors_fp(stderr); @@ -783,6 +794,10 @@ bool Speed(const std::vector<std::string> &args) { kLegacyADLen, selected) || !SpeedAEAD(EVP_aead_aes_256_cbc_sha1_tls(), "AES-256-CBC-SHA1", kLegacyADLen, selected) || + !SpeedAEADOpen(EVP_aead_aes_128_cbc_sha1_tls(), "AES-128-CBC-SHA1", + kLegacyADLen, selected) || + !SpeedAEADOpen(EVP_aead_aes_256_cbc_sha1_tls(), "AES-256-CBC-SHA1", + kLegacyADLen, selected) || !SpeedAEAD(EVP_aead_aes_128_gcm_siv(), "AES-128-GCM-SIV", kTLSADLen, selected) || !SpeedAEAD(EVP_aead_aes_256_gcm_siv(), "AES-256-GCM-SIV", kTLSADLen, |