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

Merge "cert-tool: avoid duplicates in extension stack" into integration

Browse source
This commit is contained in:
Lauren Wehrmeister 2021-01-27 18:06:18 +00:00 • committed by TrustedFirmware Code Review
commit 42ea70e86a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/cert_create/src/main.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -492,7 +492,12 @@ int main(int argc, char *argv[])
*/ */
switch (ext->type) { switch (ext->type) {
case EXT_TYPE_NVCOUNTER: case EXT_TYPE_NVCOUNTER:
if (ext->arg) { if (ext->optional && ext->arg == NULL) {
/* Skip this NVCounter */
continue;
} else {
/* Checked by `check_cmd_params` */
assert(ext->arg != NULL);
nvctr = atoi(ext->arg); nvctr = atoi(ext->arg);
CHECK_NULL(cert_ext, ext_new_nvcounter(ext_nid, CHECK_NULL(cert_ext, ext_new_nvcounter(ext_nid,
EXT_CRIT, nvctr)); EXT_CRIT, nvctr));
@ -505,7 +510,7 @@ int main(int argc, char *argv[])
memset(md, 0x0, SHA512_DIGEST_LENGTH); memset(md, 0x0, SHA512_DIGEST_LENGTH);
} else { } else {
/* Do not include this hash in the certificate */ /* Do not include this hash in the certificate */
break; continue;
} }
} else { } else {
/* Calculate the hash of the file */ /* Calculate the hash of the file */