GCC Warning for shadow

fix #2983 Signed-off-by: Shital Jumbad <[email protected]>
DMTF · Feb 25, 2025 · c55d5ec · c55d5ec
1 parent a1a0970
commit c55d5ec
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 45 deletions.
diff --git a/include/internal/libspdm_common_lib.h b/include/internal/libspdm_common_lib.h
@@ -482,7 +482,7 @@ typedef struct {
      * See LIBSPDM_FIPS_SELF_TEST_xxx;
      **/
     uint32_t self_test_result;
-} libspdm_fips_selftest_context;
+} libspdm_fips_selftest_context_t;
 #endif /* LIBSPDM_FIPS_MODE */
 
 #define LIBSPDM_CONTEXT_STRUCT_VERSION 0x3
@@ -612,7 +612,7 @@ typedef struct {
 #endif /* LIBSPDM_ENABLE_MSG_LOG */
 
 #if LIBSPDM_FIPS_MODE
-    libspdm_fips_selftest_context fips_selftest_context;
+    libspdm_fips_selftest_context_t fips_selftest_context;
 #endif /* LIBSPDM_FIPS_MODE */
 
     /* Endianness (BE/LE/Both) to use for signature verification on SPDM 1.0 and 1.1

diff --git a/library/spdm_common_lib/libspdm_com_context_data.c b/library/spdm_common_lib/libspdm_com_context_data.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
+ *  Copyright 2021-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -2812,7 +2812,7 @@ void libspdm_set_last_spdm_error_struct(void *spdm_context, libspdm_error_struct
  */
 libspdm_return_t libspdm_init_fips_selftest_context(void *fips_selftest_context)
 {
-    libspdm_fips_selftest_context *context;
+    libspdm_fips_selftest_context_t *context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     context = fips_selftest_context;
@@ -2834,7 +2834,7 @@ size_t libspdm_get_fips_selftest_context_size(void)
 {
     size_t size;
 
-    size = sizeof(libspdm_fips_selftest_context);
+    size = sizeof(libspdm_fips_selftest_context_t);
     return size;
 }
 
@@ -2852,7 +2852,7 @@ bool libspdm_import_fips_selftest_context_to_spdm_context(void *spdm_context,
                                                           void *fips_selftest_context,
                                                           size_t fips_selftest_context_size)
 {
-    libspdm_fips_selftest_context *libspdm_fips_selftest_context;
+    libspdm_fips_selftest_context_t *libspdm_fips_selftest_context;
     libspdm_context_t *libspdm_context;
 
     libspdm_context = spdm_context;
@@ -2861,13 +2861,13 @@ bool libspdm_import_fips_selftest_context_to_spdm_context(void *spdm_context,
     if ((libspdm_context == NULL) || (libspdm_fips_selftest_context == NULL)) {
         return false;
     }
-    if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context)) {
+    if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context_t)) {
         return false;
     }
 
     libspdm_copy_mem(&(libspdm_context->fips_selftest_context),
-                     sizeof(libspdm_fips_selftest_context),
-                     libspdm_fips_selftest_context, sizeof(libspdm_fips_selftest_context));
+                     sizeof(libspdm_fips_selftest_context_t),
+                     libspdm_fips_selftest_context, sizeof(libspdm_fips_selftest_context_t));
     return true;
 }
 
@@ -2885,7 +2885,7 @@ bool libspdm_export_fips_selftest_context_from_spdm_context(void *spdm_context,
                                                             void *fips_selftest_context,
                                                             size_t fips_selftest_context_size)
 {
-    libspdm_fips_selftest_context *libspdm_fips_selftest_context;
+    libspdm_fips_selftest_context_t *libspdm_fips_selftest_context;
     libspdm_context_t *libspdm_context;
 
     libspdm_context = spdm_context;
@@ -2894,14 +2894,14 @@ bool libspdm_export_fips_selftest_context_from_spdm_context(void *spdm_context,
     if ((libspdm_context == NULL) || (libspdm_fips_selftest_context == NULL)) {
         return false;
     }
-    if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context)) {
+    if (fips_selftest_context_size != sizeof(libspdm_fips_selftest_context_t)) {
         return false;
     }
 
     libspdm_copy_mem(libspdm_fips_selftest_context,
-                     sizeof(libspdm_fips_selftest_context),
+                     sizeof(libspdm_fips_selftest_context_t),
                      &(libspdm_context->fips_selftest_context),
-                     sizeof(libspdm_fips_selftest_context));
+                     sizeof(libspdm_fips_selftest_context_t));
     return true;
 }
 

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest.c b/library/spdm_crypt_lib/fips/libspdm_selftest.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -13,7 +13,7 @@
 /*run all of the self-tests and returns the results.*/
 bool libspdm_fips_run_selftest(void *fips_selftest_context)
 {
-    libspdm_fips_selftest_context *context;
+    libspdm_fips_selftest_context_t *context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     context = fips_selftest_context;

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c b/library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_aes_gcm(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_AEAD_GCM_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c b/library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_ecdh(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_ECDHE_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c b/library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -33,7 +33,7 @@ bool libspdm_fips_selftest_ecdsa(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_ECDSA_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c b/library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_eddsa(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_EDDSA_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c b/library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -17,7 +17,7 @@ bool libspdm_fips_selftest_ffdh(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_FFDHE_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c b/library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_hkdf(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA256_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c b/library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_hmac_sha256(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA256_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/
@@ -79,7 +79,7 @@ bool libspdm_fips_selftest_hmac_sha384(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA384_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/
@@ -142,7 +142,7 @@ bool libspdm_fips_selftest_hmac_sha512(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA512_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c b/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -19,7 +19,7 @@ bool libspdm_fips_selftest_rsa_pss(void *fips_selftest_context)
     bool result = true;
 
 #if (LIBSPDM_RSA_PSS_SUPPORT) && (LIBSPDM_SHA256_SUPPORT)
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c b/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_rsa_ssa(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_RSA_SSA_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c b/library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_sha256(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA256_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/
@@ -55,7 +55,7 @@ bool libspdm_fips_selftest_sha384(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA384_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/
@@ -92,7 +92,7 @@ bool libspdm_fips_selftest_sha512(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA512_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c b/library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -18,7 +18,7 @@ bool libspdm_fips_selftest_sha3_256(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA3_256_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/
@@ -79,7 +79,7 @@ bool libspdm_fips_selftest_sha3_384(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA3_384_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/
@@ -142,7 +142,7 @@ bool libspdm_fips_selftest_sha3_512(void *fips_selftest_context)
     bool result = true;
 
 #if LIBSPDM_SHA3_512_SUPPORT
-    libspdm_fips_selftest_context *context = fips_selftest_context;
+    libspdm_fips_selftest_context_t *context = fips_selftest_context;
     LIBSPDM_ASSERT(fips_selftest_context != NULL);
 
     /* any test fail cause the FIPS fail*/

diff --git a/unit_test/test_spdm_fips/test_spdm_fips.c b/unit_test/test_spdm_fips/test_spdm_fips.c
@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
+ *  Copyright 2023-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -15,7 +15,7 @@ void libspdm_test_fips(void **state)
 
 #if LIBSPDM_FIPS_MODE
 
-    libspdm_fips_selftest_context fips_selftest_context;
+    libspdm_fips_selftest_context_t fips_selftest_context;
     fips_selftest_context.tested_algo = 0;
     fips_selftest_context.self_test_result = 0;