diff options
| author | Joel Kitching <kitching@google.com> | 2019-10-02 00:06:29 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-21 04:48:33 +0000 |
| commit | 2abf0e7b7038b4ac12ea5edf7db00dad09a8e5c7 (patch) | |
| tree | eee999daff88272ef010bd2843d944b5a179480f /firmware/2lib/include/2return_codes.h | |
| parent | f06f7551e16bb5e44b3b1f2fd5788ea86825cd7e (diff) | |
| download | vboot-2abf0e7b7038b4ac12ea5edf7db00dad09a8e5c7.tar.gz | |
vboot: update secdata accessors to match those of FWMP
Instead of returning vb2_error_t, use VB2_DIE to exit on error.
BUG=b:124141368, chromium:972956, chromium:1006689,
TEST=make clean && make runtests
BRANCH=none
Change-Id: I9497eebb0b8815734fdf875ba4f9ef5eda5e82fd
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1833365
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/2lib/include/2return_codes.h')
| -rw-r--r-- | firmware/2lib/include/2return_codes.h | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/firmware/2lib/include/2return_codes.h b/firmware/2lib/include/2return_codes.h index ed34109e..fa0ed3b7 100644 --- a/firmware/2lib/include/2return_codes.h +++ b/firmware/2lib/include/2return_codes.h @@ -160,20 +160,25 @@ enum vb2_return_code { /* Bad struct version in vb2api_secdata_firmware_check() */ VB2_ERROR_SECDATA_FIRMWARE_VERSION, - /* Invalid param in vb2_secdata_firmware_get() */ - VB2_ERROR_SECDATA_FIRMWARE_GET_PARAM, + /* Invalid param in vb2_secdata_firmware_get(); + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_FIRMWARE_GET_PARAM, - /* Invalid param in vb2_secdata_firmware_set() */ - VB2_ERROR_SECDATA_FIRMWARE_SET_PARAM, + /* Invalid param in vb2_secdata_firmware_set(); + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_FIRMWARE_SET_PARAM, - /* Invalid flags passed to vb2_secdata_firmware_set() */ - VB2_ERROR_SECDATA_FIRMWARE_SET_FLAGS, + /* Invalid flags passed to vb2_secdata_firmware_set(); + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_FIRMWARE_SET_FLAGS, - /* Called vb2_secdata_firmware_get() with uninitialized secdata */ - VB2_ERROR_SECDATA_FIRMWARE_GET_UNINITIALIZED, + /* Called vb2_secdata_firmware_get() with uninitialized secdata; + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_FIRMWARE_GET_UNINITIALIZED, - /* Called vb2_secdata_firmware_set() with uninitialized secdata */ - VB2_ERROR_SECDATA_FIRMWARE_SET_UNINITIALIZED, + /* Called vb2_secdata_firmware_set() with uninitialized secdata; + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_FIRMWARE_SET_UNINITIALIZED, /* Bad CRC in vb2api_secdata_kernel_check() */ VB2_ERROR_SECDATA_KERNEL_CRC, @@ -184,20 +189,25 @@ enum vb2_return_code { /* Bad uid in vb2_secdata_kernel_init() */ VB2_ERROR_SECDATA_KERNEL_UID, - /* Invalid param in vb2_secdata_kernel_get() */ - VB2_ERROR_SECDATA_KERNEL_GET_PARAM, + /* Invalid param in vb2_secdata_kernel_get(); + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_KERNEL_GET_PARAM, - /* Invalid param in vb2_secdata_kernel_set() */ - VB2_ERROR_SECDATA_KERNEL_SET_PARAM, + /* Invalid param in vb2_secdata_kernel_set(); + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_KERNEL_SET_PARAM, - /* Invalid flags passed to vb2_secdata_kernel_set() */ - VB2_ERROR_SECDATA_KERNEL_SET_FLAGS, + /* Invalid flags passed to vb2_secdata_kernel_set(); + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_KERNEL_SET_FLAGS, - /* Called vb2_secdata_kernel_get() with uninitialized secdata_kernel */ - VB2_ERROR_SECDATA_KERNEL_GET_UNINITIALIZED, + /* Called vb2_secdata_kernel_get() with uninitialized secdata_kernel; + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_KERNEL_GET_UNINITIALIZED, - /* Called vb2_secdata_kernel_set() with uninitialized secdata_kernel */ - VB2_ERROR_SECDATA_KERNEL_SET_UNINITIALIZED, + /* Called vb2_secdata_kernel_set() with uninitialized secdata_kernel; + Deprecated with chromium:972956. */ + VB2_ERROR_DEPRECATED_SECDATA_KERNEL_SET_UNINITIALIZED, /* Bad size in vb2api_secdata_fwmp_check() */ VB2_ERROR_SECDATA_FWMP_SIZE, |