diff options
| author | Yi Chou <yich@google.com> | 2023-04-18 07:04:14 +0000 |
|---|---|---|
| committer | Yi Chou <yich@google.com> | 2023-04-18 07:11:32 +0000 |
| commit | 2c338a7e8a7f33b94a9b5164be85e0c62b6dae3e (patch) | |
| tree | 9ca566edea0c0186f769e442b5183d17f0a38336 /test | |
| parent | b2ddaa748824a5430ab6ccce2b896efda3339788 (diff) | |
| download | chrome-ec-2c338a7e8a7f33b94a9b5164be85e0c62b6dae3e.tar.gz | |
Revert "Use third_party boringssl for AES"
This reverts commit 6fa9cc0c7484be908010a6acdd6547d686234e34.
Reason for revert: break the build of chromeos-base/chromeos-fpmcu-unittests.
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
Change-Id: Ie6acdab0be298625229b69eb9ac3ff5fd196387c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4439430
Commit-Queue: Yi Chou <yich@google.com>
Owners-Override: Yi Chou <yich@google.com>
Reviewed-by: Howard Yang <hcyang@google.com>
Tested-by: Yi Chou <yich@google.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/aes.cc | 9 | ||||
| -rw-r--r-- | test/test_config.h | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/test/aes.cc b/test/aes.cc index 98d79b4b03..d08679d489 100644 --- a/test/aes.cc +++ b/test/aes.cc @@ -19,6 +19,8 @@ #include "test_util.h" extern "C" { +#include "aes-gcm.h" +#include "aes.h" #include "builtin/assert.h" #include "console.h" #include "timer.h" @@ -26,13 +28,6 @@ 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 51c15f4c8c..8f1c482b71 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -31,7 +31,8 @@ #endif #if defined(TEST_AES) || defined(TEST_CRYPTO_BENCHMARK) -#define CONFIG_BORINGSSL_CRYPTO +#define CONFIG_AES +#define CONFIG_AES_GCM #endif #ifdef TEST_BASE32 @@ -109,7 +110,8 @@ #if defined(TEST_FPSENSOR) || defined(TEST_FPSENSOR_STATE) || \ defined(TEST_FPSENSOR_CRYPTO) -#define CONFIG_BORINGSSL_CRYPTO +#define CONFIG_AES +#define CONFIG_AES_GCM #define CONFIG_ROLLBACK_SECRET_SIZE 32 #define CONFIG_SHA256 #endif |