diff options
| author | Patryk Duda <pdk@semihalf.com> | 2023-03-23 17:37:58 +0100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-08 18:08:46 +0000 |
| commit | c5b0963b4c369cebb751bad628dfcde3f44db4ad (patch) | |
| tree | 1539239f057c83128e6f8f75d23587554444bd26 | |
| parent | 1cef98f0913f36c4668bb7d74a03e701f6dfbebc (diff) | |
| download | chrome-ec-c5b0963b4c369cebb751bad628dfcde3f44db4ad.tar.gz | |
rollback: Use OPENSSL_cleanse() when BoringSSL is enabled
Since we are switching from cryptoc to BoringSSL on some boards, we
should support OPENSSL_cleanse() function provided by BoringSSL to avoid
compiling and linking both libcryptoc and BoringSSL.
BUG=b:277029648
TEST=make BOARD=prism
TEST=make BOARD=hammer
TEST=make BOARD=bloonchipper
TEST=make BOARD=dartmonkey
Change-Id: Ief5dc28adecaf33120094ba42e418144cdafe9e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4383046
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Tested-by: Patryk Duda <patrykd@google.com>
Commit-Queue: Patryk Duda <patrykd@google.com>
| -rw-r--r-- | common/rollback.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/common/rollback.c b/common/rollback.c index 8e29b97d28..2ff7b3f40b 100644 --- a/common/rollback.c +++ b/common/rollback.c @@ -8,9 +8,6 @@ #include "builtin/assert.h" #include "common.h" #include "console.h" -#ifdef CONFIG_LIBCRYPTOC -#include "cryptoc/util.h" -#endif #include "flash.h" #include "hooks.h" #include "host_command.h" @@ -25,6 +22,18 @@ #include "trng.h" #include "util.h" +#ifdef CONFIG_ROLLBACK_SECRET_SIZE +#ifdef CONFIG_BORINGSSL_CRYPTO +#include "openssl/mem.h" +#define secure_clear(buffer, size) OPENSSL_cleanse(buffer, size) +#elif defined(CONFIG_LIBCRYPTOC) +#include "cryptoc/util.h" +#define secure_clear(buffer, size) always_memset(buffer, 0, size) +#else +#error One of CONFIG_BORINGSSL_CRYPTO or CONFIG_LIBCRYPTOC should be defined +#endif +#endif + /* Console output macros */ #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) @@ -73,7 +82,7 @@ static uint32_t unlock_rollback(void) static void clear_rollback(struct rollback_data *data) { #ifdef CONFIG_ROLLBACK_SECRET_SIZE - always_memset(data->secret, 0, sizeof(data->secret)); + secure_clear(data->secret, sizeof(data->secret)); #endif } @@ -222,7 +231,7 @@ static int add_entropy(uint8_t *dst, const uint8_t *src, const uint8_t *add, #ifdef CONFIG_ROLLBACK_SECRET_LOCAL_ENTROPY_SIZE failed: #endif - always_memset(&ctx, 0, sizeof(ctx)); + secure_clear(&ctx, sizeof(ctx)); return ret; } #else |