diff options
| author | Etienne Carriere <etienne.carriere@linaro.org> | 2016-07-23 10:57:10 +0200 |
|---|---|---|
| committer | Etienne Carriere <etienne.carriere@linaro.org> | 2016-08-09 15:24:14 +0200 |
| commit | d13278b879afbe61bc625d85bf35ac2eb20bd844 (patch) | |
| tree | eca38bb007f801f1b542bb6d16f741b9fc8d7e58 /core/tee/tee_fs_key_manager.c | |
| parent | 8ddf5a4e3ce277adee040d90758ec08b429e9e4f (diff) | |
core: remove TEE_ASSERT()
TEE_ASSERT() can be confusing regarding assert() as assert() can
be disabled through NDEBUG while TEE_ASSERT() can't.
Instead one should explicitly implement "if (cond) { panic(); }"
This patch removes several inclusions on tee_common_unpg.h as it
used to define TEE_ASSERT() that has been removed.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jens Wiklander <jen.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (QEMU)
Diffstat (limited to 'core/tee/tee_fs_key_manager.c')
| -rw-r--r-- | core/tee/tee_fs_key_manager.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/tee/tee_fs_key_manager.c b/core/tee/tee_fs_key_manager.c index 8fa22828..6636554c 100644 --- a/core/tee/tee_fs_key_manager.c +++ b/core/tee/tee_fs_key_manager.c @@ -40,8 +40,8 @@ #include <initcall.h> #include <stdlib.h> #include <string.h> +#include <kernel/panic.h> #include <kernel/tee_common_otp.h> -#include <kernel/tee_common_unpg.h> #include <kernel/tee_ta_manager.h> #include <tee/tee_cryp_utl.h> #include <tee/tee_cryp_provider.h> @@ -286,8 +286,7 @@ size_t tee_fs_get_header_size(enum tee_fs_file_type type) header_size = sizeof(struct block_header); break; default: - EMSG("Unknown file type, type=%d", type); - TEE_ASSERT(0); + panic(); } return header_size; |