Skip to content

Commit 2213f92

Browse files
ShitalJumbadjyao1
ShitalJumbad
authored and
jyao1
committed
GCC Warning for shadow
fix #2983 Signed-off-by: Shital Jumbad <sjumbad@nvidia.com>
1 parent 8626aff commit 2213f92

15 files changed

+45
-45
lines changed

‎include/internal/libspdm_common_lib.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ typedef struct {
482482
* See LIBSPDM_FIPS_SELF_TEST_xxx;
483483
**/
484484
uint32_t self_test_result;
485-
} libspdm_fips_selftest_context;
485+
} libspdm_fips_selftest_context_t;
486486
#endif /* LIBSPDM_FIPS_MODE */
487487

488488
#define LIBSPDM_CONTEXT_STRUCT_VERSION 0x3
@@ -612,7 +612,7 @@ typedef struct {
612612
#endif /* LIBSPDM_ENABLE_MSG_LOG */
613613

614614
#if LIBSPDM_FIPS_MODE
615-
libspdm_fips_selftest_context fips_selftest_context;
615+
libspdm_fips_selftest_context_t fips_selftest_context;
616616
#endif /* LIBSPDM_FIPS_MODE */
617617

618618
/* Endianness (BE/LE/Both) to use for signature verification on SPDM 1.0 and 1.1

‎library/spdm_common_lib/libspdm_com_context_data.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2021-2024 DMTF. All rights reserved.
3+
* Copyright 2021-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -2812,7 +2812,7 @@ void libspdm_set_last_spdm_error_struct(void *spdm_context, libspdm_error_struct
28122812
*/
28132813
libspdm_return_t libspdm_init_fips_selftest_context(void *fips_selftest_context)
28142814
{
2815-
libspdm_fips_selftest_context *context;
2815+
libspdm_fips_selftest_context_t *context;
28162816
LIBSPDM_ASSERT(fips_selftest_context != NULL);
28172817

28182818
context = fips_selftest_context;
@@ -2834,7 +2834,7 @@ size_t libspdm_get_fips_selftest_context_size(void)
28342834
{
28352835
size_t size;
28362836

2837-
size = sizeof(libspdm_fips_selftest_context);
2837+
size = sizeof(libspdm_fips_selftest_context_t);
28382838
return size;
28392839
}
28402840

@@ -2852,7 +2852,7 @@ bool libspdm_import_fips_selftest_context_to_spdm_context(void *spdm_context,
28522852
void *fips_selftest_context,
28532853
size_t fips_selftest_context_size)
28542854
{
2855-
libspdm_fips_selftest_context *libspdm_fips_selftest_context;
2855+
libspdm_fips_selftest_context_t *libspdm_fips_selftest_context;
28562856
libspdm_context_t *libspdm_context;
28572857

28582858
libspdm_context = spdm_context;
@@ -2861,13 +2861,13 @@ bool libspdm_import_fips_selftest_context_to_spdm_context(void *spdm_context,
28612861
if ((libspdm_context == NULL) || (libspdm_fips_selftest_context == NULL)) {
28622862
return false;
28632863
}
2864-
if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context)) {
2864+
if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context_t)) {
28652865
return false;
28662866
}
28672867

28682868
libspdm_copy_mem(&(libspdm_context->fips_selftest_context),
2869-
sizeof(libspdm_fips_selftest_context),
2870-
libspdm_fips_selftest_context, sizeof(libspdm_fips_selftest_context));
2869+
sizeof(libspdm_fips_selftest_context_t),
2870+
libspdm_fips_selftest_context, sizeof(libspdm_fips_selftest_context_t));
28712871
return true;
28722872
}
28732873

@@ -2885,7 +2885,7 @@ bool libspdm_export_fips_selftest_context_from_spdm_context(void *spdm_context,
28852885
void *fips_selftest_context,
28862886
size_t fips_selftest_context_size)
28872887
{
2888-
libspdm_fips_selftest_context *libspdm_fips_selftest_context;
2888+
libspdm_fips_selftest_context_t *libspdm_fips_selftest_context;
28892889
libspdm_context_t *libspdm_context;
28902890

28912891
libspdm_context = spdm_context;
@@ -2894,14 +2894,14 @@ bool libspdm_export_fips_selftest_context_from_spdm_context(void *spdm_context,
28942894
if ((libspdm_context == NULL) || (libspdm_fips_selftest_context == NULL)) {
28952895
return false;
28962896
}
2897-
if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context)) {
2897+
if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context_t)) {
28982898
return false;
28992899
}
29002900

29012901
libspdm_copy_mem(libspdm_fips_selftest_context,
2902-
sizeof(libspdm_fips_selftest_context),
2902+
sizeof(libspdm_fips_selftest_context_t),
29032903
&(libspdm_context->fips_selftest_context),
2904-
sizeof(libspdm_fips_selftest_context));
2904+
sizeof(libspdm_fips_selftest_context_t));
29052905
return true;
29062906
}
29072907

‎library/spdm_crypt_lib/fips/libspdm_selftest.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -13,7 +13,7 @@
1313
/*run all of the self-tests and returns the results.*/
1414
bool libspdm_fips_run_selftest(void *fips_selftest_context)
1515
{
16-
libspdm_fips_selftest_context *context;
16+
libspdm_fips_selftest_context_t *context;
1717
LIBSPDM_ASSERT(fips_selftest_context != NULL);
1818

1919
context = fips_selftest_context;

‎library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_aes_gcm(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_AEAD_GCM_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_ecdh(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_ECDHE_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -33,7 +33,7 @@ bool libspdm_fips_selftest_ecdsa(void *fips_selftest_context)
3333
bool result = true;
3434

3535
#if LIBSPDM_ECDSA_SUPPORT
36-
libspdm_fips_selftest_context *context = fips_selftest_context;
36+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
3737
LIBSPDM_ASSERT(fips_selftest_context != NULL);
3838

3939
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_eddsa(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_EDDSA_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -17,7 +17,7 @@ bool libspdm_fips_selftest_ffdh(void *fips_selftest_context)
1717
bool result = true;
1818

1919
#if LIBSPDM_FFDHE_SUPPORT
20-
libspdm_fips_selftest_context *context = fips_selftest_context;
20+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2121
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2222

2323
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_hkdf(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_SHA256_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_hmac_sha256(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_SHA256_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/
@@ -79,7 +79,7 @@ bool libspdm_fips_selftest_hmac_sha384(void *fips_selftest_context)
7979
bool result = true;
8080

8181
#if LIBSPDM_SHA384_SUPPORT
82-
libspdm_fips_selftest_context *context = fips_selftest_context;
82+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
8383
LIBSPDM_ASSERT(fips_selftest_context != NULL);
8484

8585
/* any test fail cause the FIPS fail*/
@@ -142,7 +142,7 @@ bool libspdm_fips_selftest_hmac_sha512(void *fips_selftest_context)
142142
bool result = true;
143143

144144
#if LIBSPDM_SHA512_SUPPORT
145-
libspdm_fips_selftest_context *context = fips_selftest_context;
145+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
146146
LIBSPDM_ASSERT(fips_selftest_context != NULL);
147147

148148
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -19,7 +19,7 @@ bool libspdm_fips_selftest_rsa_pss(void *fips_selftest_context)
1919
bool result = true;
2020

2121
#if (LIBSPDM_RSA_PSS_SUPPORT) && (LIBSPDM_SHA256_SUPPORT)
22-
libspdm_fips_selftest_context *context = fips_selftest_context;
22+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2323
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2424

2525
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_rsa_ssa(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_RSA_SSA_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_sha256(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_SHA256_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/
@@ -55,7 +55,7 @@ bool libspdm_fips_selftest_sha384(void *fips_selftest_context)
5555
bool result = true;
5656

5757
#if LIBSPDM_SHA384_SUPPORT
58-
libspdm_fips_selftest_context *context = fips_selftest_context;
58+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
5959
LIBSPDM_ASSERT(fips_selftest_context != NULL);
6060

6161
/* any test fail cause the FIPS fail*/
@@ -92,7 +92,7 @@ bool libspdm_fips_selftest_sha512(void *fips_selftest_context)
9292
bool result = true;
9393

9494
#if LIBSPDM_SHA512_SUPPORT
95-
libspdm_fips_selftest_context *context = fips_selftest_context;
95+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
9696
LIBSPDM_ASSERT(fips_selftest_context != NULL);
9797

9898
/* any test fail cause the FIPS fail*/

‎library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_sha3_256(void *fips_selftest_context)
1818
bool result = true;
1919

2020
#if LIBSPDM_SHA3_256_SUPPORT
21-
libspdm_fips_selftest_context *context = fips_selftest_context;
21+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
2222
LIBSPDM_ASSERT(fips_selftest_context != NULL);
2323

2424
/* any test fail cause the FIPS fail*/
@@ -79,7 +79,7 @@ bool libspdm_fips_selftest_sha3_384(void *fips_selftest_context)
7979
bool result = true;
8080

8181
#if LIBSPDM_SHA3_384_SUPPORT
82-
libspdm_fips_selftest_context *context = fips_selftest_context;
82+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
8383
LIBSPDM_ASSERT(fips_selftest_context != NULL);
8484

8585
/* any test fail cause the FIPS fail*/
@@ -142,7 +142,7 @@ bool libspdm_fips_selftest_sha3_512(void *fips_selftest_context)
142142
bool result = true;
143143

144144
#if LIBSPDM_SHA3_512_SUPPORT
145-
libspdm_fips_selftest_context *context = fips_selftest_context;
145+
libspdm_fips_selftest_context_t *context = fips_selftest_context;
146146
LIBSPDM_ASSERT(fips_selftest_context != NULL);
147147

148148
/* any test fail cause the FIPS fail*/

‎unit_test/test_spdm_fips/test_spdm_fips.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright Notice:
3-
* Copyright 2023 DMTF. All rights reserved.
3+
* Copyright 2023-2025 DMTF. All rights reserved.
44
* License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
55
**/
66

@@ -15,7 +15,7 @@ void libspdm_test_fips(void **state)
1515

1616
#if LIBSPDM_FIPS_MODE
1717

18-
libspdm_fips_selftest_context fips_selftest_context;
18+
libspdm_fips_selftest_context_t fips_selftest_context;
1919
fips_selftest_context.tested_algo = 0;
2020
fips_selftest_context.self_test_result = 0;
2121

0 commit comments

Comments
 (0)