commit df11bed9ee05141b54da7b88cc5b7960ca858164
author David Benjamin <davidben@google.com> Sat Mar 23 08:20:40 2019 +0100
committer Adam Langley <agl@google.com> Sat Mar 23 15:15:48 2019 +0000
tree 2df93174dcbe87de1384b61aa04aa22d266aae93
parent 1a36dd4930443d5b3d7d4b466ebe4d63a282bb10

Update ImplDispatchTest for bsaes-x86_64 removal.

I always forget to update this.

Bug: 256
Change-Id: I85fea8fa48da8d4ed6a1e1f001f5e1a74f1b706d
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/35384
Reviewed-by: Adam Langley <agl@google.com>

crypto/impl_dispatch_test.cc

diff --git a/crypto/impl_dispatch_test.cc b/crypto/impl_dispatch_test.cc
index f1192a7..54ee704 100644
--- a/crypto/impl_dispatch_test.cc
+++ b/crypto/impl_dispatch_test.cc
@@ -89,7 +89,6 @@
 constexpr size_t kFlag_aes_hw_set_encrypt_key = 3;
 constexpr size_t kFlag_vpaes_encrypt = 4;
 constexpr size_t kFlag_vpaes_set_encrypt_key = 5;
-constexpr size_t kFlag_bsaes_ctr32_encrypt_blocks = 6;
 
 TEST_F(ImplDispatchTest, AEAD_AES_GCM) {
   AssertFunctionsHit(
@@ -98,9 +97,8 @@
           {kFlag_aes_hw_encrypt, aesni_},
           {kFlag_aes_hw_set_encrypt_key, aesni_},
           {kFlag_aesni_gcm_encrypt, is_x86_64_ && aesni_ && avx_movbe_},
-          {kFlag_vpaes_encrypt, !is_x86_64_ && ssse3_ && !aesni_},
-          {kFlag_vpaes_set_encrypt_key, !is_x86_64_ && ssse3_ && !aesni_},
-          {kFlag_bsaes_ctr32_encrypt_blocks, is_x86_64_ && ssse3_ && !aesni_},
+          {kFlag_vpaes_encrypt, ssse3_ && !aesni_},
+          {kFlag_vpaes_set_encrypt_key, ssse3_ && !aesni_},
       },
       [] {
         const uint8_t kZeros[16] = {0};
@@ -123,7 +121,6 @@
       {
           {kFlag_aes_hw_set_encrypt_key, aesni_},
           {kFlag_vpaes_set_encrypt_key, ssse3_ && !aesni_},
-          // BSAES will not be used for the |AES_*| functions.
       },
       [] {
         AES_KEY key;
@@ -141,7 +138,6 @@
       {
           {kFlag_aes_hw_encrypt, aesni_},
           {kFlag_vpaes_encrypt, ssse3_ && !aesni_},
-          // BSAES will not be used for the |AES_*| functions.
       },
       [&key] {
         uint8_t in[AES_BLOCK_SIZE] = {0};