diff options
| author | Yi Chou <yich@google.com> | 2023-03-31 15:52:13 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-21 12:56:15 +0000 |
| commit | 0164feeebaad4abc7deb510c57ca0707dd2babb1 (patch) | |
| tree | 6b6e81fa7d67a1bbfdb52cba0df3cb6978720ff3 /test | |
| parent | f97df4fc01a01ee50dbceca3ee4066e121fbc60e (diff) | |
| download | chrome-ec-0164feeebaad4abc7deb510c57ca0707dd2babb1.tar.gz | |
Reland "Use third_party boringssl for AES"
This is a reland of commit 6fa9cc0c7484be908010a6acdd6547d686234e34
Original change's description:
> Use third_party boringssl for AES
>
> The original boringssl copy is not maintainable in the long term.
> We should build it from the upstream version.
>
> BUG=b:248508087, b:273639386
> TEST=make runhosttests -j
> TEST=make buildall -j
> BRANCH=none
>
> Signed-off-by: Yi Chou <yich@google.com>
> Change-Id: I3ead1244c3c839590281e20e5c4828242933d1f2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3925087
> Reviewed-by: Tom Hughes <tomhughes@chromium.org>
BUG=b:248508087, b:273639386
TEST=make runhosttests -j
TEST=make buildall -j
BRANCH=none
Signed-off-by: Yi Chou <yich@google.com>
Cq-Depend: chromium:4439330
Change-Id: Ic22faafacaf331a1376d094a37c6efe271326d0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4439569
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/aes.cc | 9 | ||||
| -rw-r--r-- | test/test_config.h | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/test/aes.cc b/test/aes.cc index d08679d489..98d79b4b03 100644 --- a/test/aes.cc +++ b/test/aes.cc @@ -19,8 +19,6 @@ #include "test_util.h" extern "C" { -#include "aes-gcm.h" -#include "aes.h" #include "builtin/assert.h" #include "console.h" #include "timer.h" @@ -28,6 +26,13 @@ extern "C" { #include "watchdog.h" } +#include "aes_gcm_helpers.h" +#include "openssl/aes.h" + +/* These must be included after the "openssl/aes.h" */ +#include "crypto/fipsmodule/aes/internal.h" +#include "crypto/fipsmodule/modes/internal.h" + /* Temporary buffer, to avoid using too much stack space. */ static uint8_t tmp[512]; diff --git a/test/test_config.h b/test/test_config.h index 8f1c482b71..51c15f4c8c 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -31,8 +31,7 @@ #endif #if defined(TEST_AES) || defined(TEST_CRYPTO_BENCHMARK) -#define CONFIG_AES -#define CONFIG_AES_GCM +#define CONFIG_BORINGSSL_CRYPTO #endif #ifdef TEST_BASE32 @@ -110,8 +109,7 @@ #if defined(TEST_FPSENSOR) || defined(TEST_FPSENSOR_STATE) || \ defined(TEST_FPSENSOR_CRYPTO) -#define CONFIG_AES -#define CONFIG_AES_GCM +#define CONFIG_BORINGSSL_CRYPTO #define CONFIG_ROLLBACK_SECRET_SIZE 32 #define CONFIG_SHA256 #endif |