diff options
| author | Roberto Vargas <roberto.vargas@arm.com> | 2018-02-12 12:36:17 +0000 |
|---|---|---|
| committer | Roberto Vargas <roberto.vargas@arm.com> | 2018-04-13 14:01:56 +0100 |
| commit | 735181b634c951d4fa6a8b454847dac53f85d5b5 (patch) | |
| tree | 905e5ef6e0718d22ce1e56fdb43401ba42a0a557 /include | |
| parent | 1a29f93815d3ec313c4667d7108d379b93ef6831 (diff) | |
| download | platform_external_arm-trusted-firmware-735181b634c951d4fa6a8b454847dac53f85d5b5.tar.gz platform_external_arm-trusted-firmware-735181b634c951d4fa6a8b454847dac53f85d5b5.tar.bz2 platform_external_arm-trusted-firmware-735181b634c951d4fa6a8b454847dac53f85d5b5.zip | |
Fix MISRA rule 8.3 Part 4
Rule 8.3: All declarations of an object or function shall
use the same names and type qualifiers
Fixed for:
make DEBUG=1 PLAT=fvp SPD=tspd TRUSTED_BOARD_BOOT=1 \
GENERATE_COT=1 ARM_ROTPK_LOCATION=devel_rsa \
ROT_KEY=arm_rotprivk_rsa.pem MBEDTLS_DIR=mbedtls all
Change-Id: Ia34fe1ae1f142e89c9a6c19831e3daf4d28f5831
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/tbbr/tbbr_img_def.h | 3 | ||||
| -rw-r--r-- | include/drivers/auth/auth_mod.h | 5 | ||||
| -rw-r--r-- | include/drivers/auth/crypto_mod.h | 4 | ||||
| -rw-r--r-- | include/drivers/auth/img_parser_mod.h | 6 |
4 files changed, 11 insertions, 7 deletions
diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h index 060198bc1..273abbea0 100644 --- a/include/common/tbbr/tbbr_img_def.h +++ b/include/common/tbbr/tbbr_img_def.h @@ -75,4 +75,7 @@ /* NT_FW_CONFIG */ #define NT_FW_CONFIG_ID 27 +/* Define size of the array */ +#define MAX_NUMBER_IDS 28 + #endif /* __TBBR_IMG_DEF_H__ */ diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h index bd6509803..74fc15fc1 100644 --- a/include/drivers/auth/auth_mod.h +++ b/include/drivers/auth/auth_mod.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -12,6 +12,7 @@ #include <auth_common.h> #include <cot_def.h> #include <img_parser_mod.h> +#include <tbbr_img_def.h> /* * Image flags @@ -41,7 +42,7 @@ int auth_mod_verify_img(unsigned int img_id, #define REGISTER_COT(_cot) \ const auth_img_desc_t *const cot_desc_ptr = \ (const auth_img_desc_t *const)&_cot[0]; \ - unsigned int auth_img_flags[sizeof(_cot)/sizeof(_cot[0])] + unsigned int auth_img_flags[MAX_NUMBER_IDS] #endif /* TRUSTED_BOARD_BOOT */ diff --git a/include/drivers/auth/crypto_mod.h b/include/drivers/auth/crypto_mod.h index 08884ab22..7a1b6b807 100644 --- a/include/drivers/auth/crypto_mod.h +++ b/include/drivers/auth/crypto_mod.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -43,7 +43,7 @@ typedef struct crypto_lib_desc_s { void crypto_mod_init(void); int crypto_mod_verify_signature(void *data_ptr, unsigned int data_len, void *sig_ptr, unsigned int sig_len, - void *sig_alg, unsigned int sig_alg_len, + void *sig_alg_ptr, unsigned int sig_alg_len, void *pk_ptr, unsigned int pk_len); int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len, void *digest_info_ptr, unsigned int digest_info_len); diff --git a/include/drivers/auth/img_parser_mod.h b/include/drivers/auth/img_parser_mod.h index 347ed621c..eaf3e6e7a 100644 --- a/include/drivers/auth/img_parser_mod.h +++ b/include/drivers/auth/img_parser_mod.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -44,10 +44,10 @@ typedef struct img_parser_lib_desc_s { /* Exported functions */ void img_parser_init(void); int img_parser_check_integrity(img_type_t img_type, - void *img, unsigned int img_len); + void *img_ptr, unsigned int img_len); int img_parser_get_auth_param(img_type_t img_type, const auth_param_type_desc_t *type_desc, - void *img, unsigned int img_len, + void *img_ptr, unsigned int img_len, void **param_ptr, unsigned int *param_len); /* Macro to register an image parser library */ |