diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2019-05-15 18:44:05 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-24 15:09:47 -0700 |
| commit | 60021c7225b3d247113b4c60e056d0cc01ad50ad (patch) | |
| tree | 42906cfdc7b2dff7ff36c679e49eccaf348c927c /chip | |
| parent | 8610d1cd4c101e7aaa77721a5e68e2f16ea0dd78 (diff) | |
| download | chrome-ec-60021c7225b3d247113b4c60e056d0cc01ad50ad.tar.gz | |
nvmem: do not run when crypto is disabled
There is no point in trying any nvmem operations when
encryption/decryption services are not available.
Test changes necessary to make sure test app compiles and runs
successfully.
BRANCH=cr50, cr50-mp
BUG=b:132800220
TEST=The device does not crash any more after tpm is disabled.
Change-Id: I97f9afc6e4d5377162500fc757084e4d5a57d37d
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1615424
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/g/crypto_api.c | 5 | ||||
| -rw-r--r-- | chip/host/dcrypto/app_cipher.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chip/g/crypto_api.c b/chip/g/crypto_api.c index 267bb31eb6..9c0c7bb8f5 100644 --- a/chip/g/crypto_api.c +++ b/chip/g/crypto_api.c @@ -29,3 +29,8 @@ int app_cipher(const void *salt, void *out, const void *in, size_t size) { return DCRYPTO_app_cipher(NVMEM, salt, out, in, size); } + +int crypto_enabled(void) +{ + return DCRYPTO_ladder_is_enabled(); +} diff --git a/chip/host/dcrypto/app_cipher.c b/chip/host/dcrypto/app_cipher.c index af6c2c4beb..69d54a41b1 100644 --- a/chip/host/dcrypto/app_cipher.c +++ b/chip/host/dcrypto/app_cipher.c @@ -31,3 +31,7 @@ int app_cipher(const void *salt_p, void *out_p, const void *in_p, size_t size) return 1; } +int crypto_enabled(void) +{ + return 1; +} |