Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-25 14:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix MISRA rule 8.3 Part 4

Browse source 
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>
This commit is contained in:
Roberto Vargas 2018-02-12 12:36:17 +00:00
parent 1a29f93815
commit 735181b634
6 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bl1/bl1_fwu.c
View file

@ -24,12 +24,12 @@
* Function declarations. * Function declarations.
*/ */
static int bl1_fwu_image_copy(unsigned int image_id, static int bl1_fwu_image_copy(unsigned int image_id,
uintptr_t image_addr, uintptr_t image_src,
unsigned int block_size, unsigned int block_size,
unsigned int image_size, unsigned int image_size,
unsigned int flags); unsigned int flags);
static int bl1_fwu_image_auth(unsigned int image_id, static int bl1_fwu_image_auth(unsigned int image_id,
uintptr_t image_addr, uintptr_t image_src,
unsigned int image_size, unsigned int image_size,
unsigned int flags); unsigned int flags);
static int bl1_fwu_image_execute(unsigned int image_id, static int bl1_fwu_image_execute(unsigned int image_id,
@ -50,7 +50,7 @@ __dead2 static void bl1_fwu_done(void *client_cookie, void *reserved);
static unsigned int sec_exec_image_id = INVALID_IMAGE_ID; static unsigned int sec_exec_image_id = INVALID_IMAGE_ID;
/* Authentication status of each image. */ /* Authentication status of each image. */
extern unsigned int auth_img_flags[]; extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
/******************************************************************************* /*******************************************************************************
* Top level handler for servicing FWU SMCs. * Top level handler for servicing FWU SMCs.

4
drivers/auth/auth_mod.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -30,7 +30,7 @@
/* Pointer to CoT */ /* Pointer to CoT */
extern const auth_img_desc_t *const cot_desc_ptr; extern const auth_img_desc_t *const cot_desc_ptr;
extern unsigned int auth_img_flags[]; extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a, static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a,
const auth_param_type_desc_t *b) const auth_param_type_desc_t *b)

3
include/common/tbbr/tbbr_img_def.h
View file

@ -75,4 +75,7 @@
/* NT_FW_CONFIG */ /* NT_FW_CONFIG */
#define NT_FW_CONFIG_ID 27 #define NT_FW_CONFIG_ID 27
/* Define size of the array */
#define MAX_NUMBER_IDS 28
#endif /* __TBBR_IMG_DEF_H__ */ #endif /* __TBBR_IMG_DEF_H__ */

5
include/drivers/auth/auth_mod.h
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -12,6 +12,7 @@
#include <auth_common.h> #include <auth_common.h>
#include <cot_def.h> #include <cot_def.h>
#include <img_parser_mod.h> #include <img_parser_mod.h>
#include <tbbr_img_def.h>
/* /*
* Image flags * Image flags
@ -41,7 +42,7 @@ int auth_mod_verify_img(unsigned int img_id,
#define REGISTER_COT(_cot) \ #define REGISTER_COT(_cot) \
const auth_img_desc_t *const cot_desc_ptr = \ const auth_img_desc_t *const cot_desc_ptr = \
(const auth_img_desc_t *const)&_cot[0]; \ (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 */ #endif /* TRUSTED_BOARD_BOOT */

4
include/drivers/auth/crypto_mod.h
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -43,7 +43,7 @@ typedef struct crypto_lib_desc_s {
void crypto_mod_init(void); void crypto_mod_init(void);
int crypto_mod_verify_signature(void *data_ptr, unsigned int data_len, int crypto_mod_verify_signature(void *data_ptr, unsigned int data_len,
void *sig_ptr, unsigned int sig_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); void *pk_ptr, unsigned int pk_len);
int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len, int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len,
void *digest_info_ptr, unsigned int digest_info_len); void *digest_info_ptr, unsigned int digest_info_len);

6
include/drivers/auth/img_parser_mod.h
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -44,10 +44,10 @@ typedef struct img_parser_lib_desc_s {
/* Exported functions */ /* Exported functions */
void img_parser_init(void); void img_parser_init(void);
int img_parser_check_integrity(img_type_t img_type, 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, int img_parser_get_auth_param(img_type_t img_type,
const auth_param_type_desc_t *type_desc, 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); void **param_ptr, unsigned int *param_len);
/* Macro to register an image parser library */ /* Macro to register an image parser library */