From f76e33f52ec4bddb420ef722f0e8bc0ae5ec6548 Mon Sep 17 00:00:00 2001
From: Gilg Heike <Heike.Gilg@infineon.com>
Date: Mon, 29 Jul 2024 17:00:31 +0200
Subject: [PATCH 1/7] Update single licensed headers to SPDX format

- Update copyright information to be compliant to SPDX
- Update to current year
- Update BSD license headers to be compliant to SPDX

Signed-off-by: Gilg Heike <Heike.Gilg@infineon.com>
---
 include/hal/base.h                                        | 5 ++---
 include/hal/library/cryptlib.h                            | 5 ++---
 include/hal/library/cryptlib/cryptlib_aead.h              | 5 ++---
 include/hal/library/cryptlib/cryptlib_cert.h              | 5 ++---
 include/hal/library/cryptlib/cryptlib_dh.h                | 5 ++---
 include/hal/library/cryptlib/cryptlib_ec.h                | 5 ++---
 include/hal/library/cryptlib/cryptlib_ecd.h               | 5 ++---
 include/hal/library/cryptlib/cryptlib_hash.h              | 5 ++---
 include/hal/library/cryptlib/cryptlib_hkdf.h              | 5 ++---
 include/hal/library/cryptlib/cryptlib_mac.h               | 5 ++---
 include/hal/library/cryptlib/cryptlib_rng.h               | 5 ++---
 include/hal/library/cryptlib/cryptlib_rsa.h               | 5 ++---
 include/hal/library/cryptlib/cryptlib_sm2.h               | 5 ++---
 include/hal/library/debuglib.h                            | 5 ++---
 include/hal/library/eventlib.h                            | 5 ++---
 include/hal/library/memlib.h                              | 5 ++---
 include/hal/library/requester/psklib.h                    | 5 ++---
 include/hal/library/requester/reqasymsignlib.h            | 5 ++---
 include/hal/library/requester/timelib.h                   | 6 +++---
 include/hal/library/responder/asymsignlib.h               | 5 ++---
 include/hal/library/responder/csrlib.h                    | 5 ++---
 include/hal/library/responder/measlib.h                   | 5 ++---
 include/hal/library/responder/psklib.h                    | 5 ++---
 include/hal/library/responder/setcertlib.h                | 5 ++---
 include/hal/library/responder/watchdoglib.h               | 6 +++---
 include/industry_standard/cxl_idekm.h                     | 5 ++---
 include/industry_standard/mctp.h                          | 5 ++---
 include/industry_standard/pci_idekm.h                     | 5 ++---
 include/industry_standard/pci_tdisp.h                     | 5 ++---
 include/industry_standard/pcidoe.h                        | 5 ++---
 include/industry_standard/pldm.h                          | 5 ++---
 include/industry_standard/spdm.h                          | 5 ++---
 include/industry_standard/spdm_secured_message.h          | 5 ++---
 include/internal/libspdm_common_lib.h                     | 5 ++---
 include/internal/libspdm_crypt_lib.h                      | 5 ++---
 include/internal/libspdm_fips_lib.h                       | 5 ++---
 include/internal/libspdm_lib_config.h                     | 5 ++---
 include/internal/libspdm_macro_check.h                    | 5 ++---
 include/internal/libspdm_requester_lib.h                  | 5 ++---
 include/internal/libspdm_responder_lib.h                  | 5 ++---
 include/internal/libspdm_secured_message_lib.h            | 5 ++---
 include/library/spdm_common_lib.h                         | 5 ++---
 include/library/spdm_crypt_lib.h                          | 5 ++---
 include/library/spdm_lib_config.h                         | 5 ++---
 include/library/spdm_requester_lib.h                      | 5 ++---
 include/library/spdm_responder_lib.h                      | 5 ++---
 include/library/spdm_return_status.h                      | 5 ++---
 include/library/spdm_secured_message_lib.h                | 5 ++---
 include/library/spdm_transport_mctp_lib.h                 | 5 ++---
 include/library/spdm_transport_pcidoe_lib.h               | 5 ++---
 library/spdm_common_lib/libspdm_com_context_data.c        | 5 ++---
 .../spdm_common_lib/libspdm_com_context_data_session.c    | 5 ++---
 library/spdm_common_lib/libspdm_com_crypto_service.c      | 5 ++---
 .../spdm_common_lib/libspdm_com_crypto_service_session.c  | 5 ++---
 library/spdm_common_lib/libspdm_com_msg_log.c             | 5 ++---
 library/spdm_common_lib/libspdm_com_opaque_data.c         | 5 ++---
 library/spdm_common_lib/libspdm_com_support.c             | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest.c            | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c    | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c       | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c      | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c      | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c       | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c       | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c       | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c    | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c    | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c       | 5 ++---
 library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c       | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_aead.c               | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_asym.c               | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_cert.c               | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_dhe.c                | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_hash.c               | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_hkdf.c               | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_hmac.c               | 5 ++---
 library/spdm_crypt_lib/libspdm_crypt_rng.c                | 5 ++---
 library/spdm_requester_lib/libspdm_req_challenge.c        | 5 ++---
 library/spdm_requester_lib/libspdm_req_common.c           | 5 ++---
 library/spdm_requester_lib/libspdm_req_communication.c    | 5 ++---
 .../spdm_requester_lib/libspdm_req_encap_certificate.c    | 5 ++---
 .../spdm_requester_lib/libspdm_req_encap_challenge_auth.c | 5 ++---
 library/spdm_requester_lib/libspdm_req_encap_digests.c    | 5 ++---
 library/spdm_requester_lib/libspdm_req_encap_error.c      | 5 ++---
 library/spdm_requester_lib/libspdm_req_encap_key_update.c | 5 ++---
 library/spdm_requester_lib/libspdm_req_encap_request.c    | 5 ++---
 library/spdm_requester_lib/libspdm_req_end_session.c      | 5 ++---
 library/spdm_requester_lib/libspdm_req_finish.c           | 5 ++---
 library/spdm_requester_lib/libspdm_req_get_capabilities.c | 5 ++---
 library/spdm_requester_lib/libspdm_req_get_certificate.c  | 5 ++---
 library/spdm_requester_lib/libspdm_req_get_csr.c          | 5 ++---
 library/spdm_requester_lib/libspdm_req_get_digests.c      | 5 ++---
 library/spdm_requester_lib/libspdm_req_get_event_types.c  | 5 ++---
 .../libspdm_req_get_measurement_extension_log.c           | 5 ++---
 library/spdm_requester_lib/libspdm_req_get_measurements.c | 5 ++---
 library/spdm_requester_lib/libspdm_req_get_version.c      | 5 ++---
 .../libspdm_req_handle_error_response.c                   | 5 ++---
 library/spdm_requester_lib/libspdm_req_heartbeat.c        | 5 ++---
 library/spdm_requester_lib/libspdm_req_key_exchange.c     | 5 ++---
 library/spdm_requester_lib/libspdm_req_key_update.c       | 5 ++---
 .../spdm_requester_lib/libspdm_req_negotiate_algorithms.c | 5 ++---
 library/spdm_requester_lib/libspdm_req_psk_exchange.c     | 5 ++---
 library/spdm_requester_lib/libspdm_req_psk_finish.c       | 5 ++---
 library/spdm_requester_lib/libspdm_req_send_receive.c     | 5 ++---
 library/spdm_requester_lib/libspdm_req_set_certificate.c  | 5 ++---
 library/spdm_requester_lib/libspdm_req_vendor_request.c   | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_algorithms.c       | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_capabilities.c     | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_certificate.c      | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_challenge_auth.c   | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_chunk_get.c        | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_chunk_send_ack.c   | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_common.c           | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_communication.c    | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_csr.c              | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_digests.c          | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_encap_challenge.c  | 5 ++---
 .../libspdm_rsp_encap_get_certificate.c                   | 5 ++---
 .../spdm_responder_lib/libspdm_rsp_encap_get_digests.c    | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_encap_key_update.c | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_encap_response.c   | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_end_session.c      | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_error.c            | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_finish.c           | 5 ++---
 .../libspdm_rsp_handle_response_state.c                   | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_heartbeat.c        | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_key_exchange.c     | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_key_update.c       | 5 ++---
 .../libspdm_rsp_measurement_extension_log.c               | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_measurements.c     | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_psk_exchange.c     | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_psk_finish.c       | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_receive_send.c     | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_respond_if_ready.c | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_set_certificate.c  | 5 ++---
 .../libspdm_rsp_supported_event_types.c                   | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_vendor_response.c  | 5 ++---
 library/spdm_responder_lib/libspdm_rsp_version.c          | 5 ++---
 .../libspdm_secmes_context_data.c                         | 5 ++---
 .../libspdm_secmes_encode_decode.c                        | 5 ++---
 .../libspdm_secmes_key_exchange.c                         | 5 ++---
 library/spdm_secured_message_lib/libspdm_secmes_session.c | 5 ++---
 library/spdm_transport_mctp_lib/libspdm_mctp_common.c     | 5 ++---
 library/spdm_transport_mctp_lib/libspdm_mctp_mctp.c       | 5 ++---
 library/spdm_transport_pcidoe_lib/libspdm_doe_common.c    | 5 ++---
 library/spdm_transport_pcidoe_lib/libspdm_doe_pcidoe.c    | 5 ++---
 os_stub/cryptlib_mbedtls/cipher/aead_aes_gcm.c            | 5 ++---
 os_stub/cryptlib_mbedtls/cipher/aead_chacha20_poly1305.c  | 5 ++---
 os_stub/cryptlib_mbedtls/cipher/aead_sm4_gcm.c            | 5 ++---
 os_stub/cryptlib_mbedtls/der/der.c                        | 5 ++---
 os_stub/cryptlib_mbedtls/hash/sha.c                       | 5 ++---
 os_stub/cryptlib_mbedtls/hash/sha3.c                      | 5 ++---
 os_stub/cryptlib_mbedtls/hash/sm3.c                       | 5 ++---
 os_stub/cryptlib_mbedtls/hmac/hmac_sha.c                  | 5 ++---
 os_stub/cryptlib_mbedtls/hmac/hmac_sha3.c                 | 5 ++---
 os_stub/cryptlib_mbedtls/hmac/hmac_sm3.c                  | 5 ++---
 os_stub/cryptlib_mbedtls/internal_crypt_lib.h             | 5 ++---
 os_stub/cryptlib_mbedtls/kdf/hkdf_sha.c                   | 5 ++---
 os_stub/cryptlib_mbedtls/kdf/hkdf_sha3.c                  | 5 ++---
 os_stub/cryptlib_mbedtls/kdf/hkdf_sm3.c                   | 5 ++---
 os_stub/cryptlib_mbedtls/pem/pem.c                        | 5 ++---
 os_stub/cryptlib_mbedtls/pk/dh.c                          | 5 ++---
 os_stub/cryptlib_mbedtls/pk/ec.c                          | 5 ++---
 os_stub/cryptlib_mbedtls/pk/ecd.c                         | 5 ++---
 os_stub/cryptlib_mbedtls/pk/rsa_basic.c                   | 5 ++---
 os_stub/cryptlib_mbedtls/pk/rsa_ext.c                     | 5 ++---
 os_stub/cryptlib_mbedtls/pk/sm2.c                         | 5 ++---
 os_stub/cryptlib_mbedtls/pk/x509.c                        | 5 ++---
 os_stub/cryptlib_mbedtls/rand/rand.c                      | 5 ++---
 os_stub/cryptlib_mbedtls/sys_call/crt_wrapper_host.c      | 5 ++---
 os_stub/cryptlib_mbedtls/sys_call/mem_allocation.c        | 5 ++---
 os_stub/cryptlib_null/cipher/aead_aes_gcm.c               | 5 ++---
 os_stub/cryptlib_null/cipher/aead_chacha20_poly1305.c     | 5 ++---
 os_stub/cryptlib_null/cipher/aead_sm4_gcm.c               | 5 ++---
 os_stub/cryptlib_null/der/der.c                           | 5 ++---
 os_stub/cryptlib_null/hash/sha.c                          | 5 ++---
 os_stub/cryptlib_null/hash/sha3.c                         | 5 ++---
 os_stub/cryptlib_null/hash/sm3.c                          | 5 ++---
 os_stub/cryptlib_null/hmac/hmac_sha.c                     | 5 ++---
 os_stub/cryptlib_null/hmac/hmac_sha3.c                    | 5 ++---
 os_stub/cryptlib_null/hmac/hmac_sm3.c                     | 5 ++---
 os_stub/cryptlib_null/internal_crypt_lib.h                | 5 ++---
 os_stub/cryptlib_null/kdf/hkdf_sha.c                      | 5 ++---
 os_stub/cryptlib_null/kdf/hkdf_sha3.c                     | 5 ++---
 os_stub/cryptlib_null/kdf/hkdf_sm3.c                      | 5 ++---
 os_stub/cryptlib_null/pem/pem.c                           | 5 ++---
 os_stub/cryptlib_null/pk/dh.c                             | 5 ++---
 os_stub/cryptlib_null/pk/ec.c                             | 5 ++---
 os_stub/cryptlib_null/pk/ecd.c                            | 5 ++---
 os_stub/cryptlib_null/pk/rsa_basic.c                      | 5 ++---
 os_stub/cryptlib_null/pk/rsa_ext.c                        | 5 ++---
 os_stub/cryptlib_null/pk/sm2.c                            | 5 ++---
 os_stub/cryptlib_null/pk/x509.c                           | 5 ++---
 os_stub/cryptlib_null/rand/rand.c                         | 5 ++---
 os_stub/cryptlib_openssl/cipher/aead_aes_gcm.c            | 5 ++---
 os_stub/cryptlib_openssl/cipher/aead_chacha20_poly1305.c  | 5 ++---
 os_stub/cryptlib_openssl/cipher/aead_sm4_gcm.c            | 5 ++---
 os_stub/cryptlib_openssl/der/der.c                        | 5 ++---
 os_stub/cryptlib_openssl/hash/sha.c                       | 5 ++---
 os_stub/cryptlib_openssl/hash/sha3.c                      | 5 ++---
 os_stub/cryptlib_openssl/hash/sm3.c                       | 5 ++---
 os_stub/cryptlib_openssl/hmac/hmac_sha.c                  | 5 ++---
 os_stub/cryptlib_openssl/hmac/hmac_sha3.c                 | 5 ++---
 os_stub/cryptlib_openssl/hmac/hmac_sm3.c                  | 5 ++---
 os_stub/cryptlib_openssl/internal_crypt_lib.h             | 5 ++---
 os_stub/cryptlib_openssl/kdf/hkdf_sha.c                   | 5 ++---
 os_stub/cryptlib_openssl/kdf/hkdf_sha3.c                  | 5 ++---
 os_stub/cryptlib_openssl/kdf/hkdf_sm3.c                   | 5 ++---
 os_stub/cryptlib_openssl/pem/pem.c                        | 5 ++---
 os_stub/cryptlib_openssl/pk/dh.c                          | 5 ++---
 os_stub/cryptlib_openssl/pk/ec.c                          | 5 ++---
 os_stub/cryptlib_openssl/pk/ecd.c                         | 5 ++---
 os_stub/cryptlib_openssl/pk/rsa_basic.c                   | 5 ++---
 os_stub/cryptlib_openssl/pk/rsa_ext.c                     | 5 ++---
 os_stub/cryptlib_openssl/pk/sm2.c                         | 5 ++---
 os_stub/cryptlib_openssl/pk/x509.c                        | 5 ++---
 os_stub/cryptlib_openssl/rand/rand.c                      | 5 ++---
 os_stub/cryptlib_openssl/sys_call/crt_wrapper_host.c      | 5 ++---
 os_stub/debuglib/debuglib.c                               | 5 ++---
 os_stub/debuglib_null/debuglib.c                          | 5 ++---
 os_stub/include/industry_standard/link_type_ex.h          | 5 ++---
 os_stub/include/industry_standard/pcap.h                  | 5 ++---
 os_stub/include/library/malloclib.h                       | 5 ++---
 os_stub/include/library/rnglib.h                          | 5 ++---
 os_stub/malloclib/malloclib.c                             | 5 ++---
 os_stub/memlib/compare_mem.c                              | 5 ++---
 os_stub/memlib/copy_mem.c                                 | 5 ++---
 os_stub/memlib/set_mem.c                                  | 5 ++---
 os_stub/memlib/zero_mem.c                                 | 5 ++---
 os_stub/openssllib/buildinf.h                             | 5 ++---
 os_stub/openssllib/include/arpa/inet.h                    | 5 ++---
 os_stub/openssllib/include/arpa/nameser.h                 | 5 ++---
 os_stub/openssllib/include/assert.h                       | 5 ++---
 os_stub/openssllib/include/crt_support.h                  | 5 ++---
 os_stub/openssllib/include/ctype.h                        | 5 ++---
 os_stub/openssllib/include/limits.h                       | 5 ++---
 os_stub/openssllib/include/memory.h                       | 5 ++---
 os_stub/openssllib/include/netinet/in.h                   | 5 ++---
 os_stub/openssllib/include/openssl/configuration.h        | 5 ++---
 os_stub/openssllib/include/stdarg.h                       | 5 ++---
 os_stub/openssllib/include/stdatomic.h                    | 5 ++---
 os_stub/openssllib/include/stdio.h                        | 5 ++---
 os_stub/openssllib/include/stdlib.h                       | 5 ++---
 os_stub/openssllib/include/string.h                       | 5 ++---
 os_stub/openssllib/include/strings.h                      | 5 ++---
 os_stub/openssllib/include/sys/param.h                    | 5 ++---
 os_stub/openssllib/include/sys/shm.h                      | 5 ++---
 os_stub/openssllib/include/sys/socket.h                   | 5 ++---
 os_stub/openssllib/include/sys/syscall.h                  | 5 ++---
 os_stub/openssllib/include/sys/time.h                     | 5 ++---
 os_stub/openssllib/include/sys/types.h                    | 5 ++---
 os_stub/openssllib/include/sys/utsname.h                  | 5 ++---
 os_stub/openssllib/include/syslog.h                       | 5 ++---
 os_stub/openssllib/include/time.h                         | 5 ++---
 os_stub/openssllib/include/unistd.h                       | 5 ++---
 os_stub/openssllib/ossl_store.c                           | 6 ++----
 os_stub/openssllib/rand_pool.c                            | 6 ++----
 os_stub/platform_lib/time_linux.c                         | 5 ++---
 os_stub/platform_lib/time_sample.c                        | 5 ++---
 os_stub/platform_lib/time_win.c                           | 5 ++---
 os_stub/platform_lib/watchdog.c                           | 5 ++---
 os_stub/platform_lib_null/time_linux.c                    | 5 ++---
 os_stub/platform_lib_null/time_win.c                      | 5 ++---
 os_stub/platform_lib_null/watchdog.c                      | 5 ++---
 os_stub/rnglib/rng_arm_sample.c                           | 5 ++---
 os_stub/rnglib/rng_linux.c                                | 5 ++---
 os_stub/rnglib/rng_std.c                                  | 5 ++---
 os_stub/rnglib/rng_win.c                                  | 5 ++---
 .../spdm_cert_verify_callback.c                           | 5 ++---
 .../spdm_cert_verify_callback_internal.h                  | 5 ++---
 os_stub/spdm_crypt_ext_lib/cryptlib_ext.h                 | 5 ++---
 os_stub/spdm_crypt_ext_lib/spdm_crypt_ext.c               | 5 ++---
 os_stub/spdm_crypt_ext_lib/spdm_crypt_ext_lib.h           | 5 ++---
 os_stub/spdm_device_secret_lib_null/lib.c                 | 5 ++---
 os_stub/spdm_device_secret_lib_sample/cert.c              | 5 ++---
 os_stub/spdm_device_secret_lib_sample/lib.c               | 5 ++---
 os_stub/spdm_device_secret_lib_sample/raw_data_key.h      | 5 ++---
 .../spdm_device_secret_lib_internal.h                     | 5 ++---
 unit_test/cmockalib/strdup.c                              | 5 ++---
 unit_test/fuzzing/spdm_unit_fuzzing_common/algo.c         | 5 ++---
 unit_test/fuzzing/spdm_unit_fuzzing_common/common.c       | 5 ++---
 .../fuzzing/spdm_unit_fuzzing_common/spdm_unit_fuzzing.h  | 5 ++---
 .../fuzzing/spdm_unit_fuzzing_common/toolchain_harness.c  | 5 ++---
 .../fuzzing/spdm_unit_fuzzing_common/toolchain_harness.h  | 5 ++---
 .../test_spdm_requester_challenge/challenge.c             | 5 ++---
 .../test_spdm_requester_chunk_get/chunk_get.c             | 5 ++---
 .../test_spdm_requester_chunk_send/chunk_send.c           | 5 ++---
 .../encap_certificate.c                                   | 5 ++---
 .../encap_challenge_auth.c                                | 5 ++---
 .../test_spdm_requester_encap_digests/encap_digests.c     | 5 ++---
 .../encap_key_update.c                                    | 5 ++---
 .../test_spdm_requester_encap_request/encap_request.c     | 5 ++---
 .../test_spdm_requester_end_session/end_session.c         | 5 ++---
 .../test_requester/test_spdm_requester_finish/finish.c    | 5 ++---
 .../get_capabilities.c                                    | 5 ++---
 .../test_spdm_requester_get_certificate/get_certificate.c | 5 ++---
 .../test_requester/test_spdm_requester_get_csr/get_csr.c  | 5 ++---
 .../test_spdm_requester_get_digests/get_digests.c         | 5 ++---
 .../test_spdm_requester_get_event_types/get_event_types.c | 5 ++---
 .../get_measurement_extension_log.c                       | 5 ++---
 .../get_measurements.c                                    | 5 ++---
 .../test_spdm_requester_get_version/get_version.c         | 5 ++---
 .../test_spdm_requester_heartbeat/heartbeat.c             | 5 ++---
 .../test_spdm_requester_key_exchange/key_exchange.c       | 5 ++---
 .../test_spdm_requester_key_update/key_update.c           | 5 ++---
 .../negotiate_algorithms.c                                | 5 ++---
 .../test_spdm_requester_psk_exchange/psk_exchange.c       | 5 ++---
 .../test_spdm_requester_psk_finish/psk_finish.c           | 5 ++---
 .../test_spdm_requester_set_certificate/set_certificate.c | 5 ++---
 .../test_spdm_requester_vendor_cmds/vendor_cmds.c         | 5 ++---
 .../test_spdm_responder_algorithms/algorithms.c           | 5 ++---
 .../test_spdm_responder_capabilities/capabilities.c       | 5 ++---
 .../test_spdm_responder_certificate/certificate.c         | 5 ++---
 .../test_spdm_responder_challenge_auth/challenge_auth.c   | 5 ++---
 .../test_spdm_responder_chunk_get/chunk_get.c             | 5 ++---
 .../test_spdm_responder_chunk_send_ack/chunk_send_ack.c   | 5 ++---
 .../fuzzing/test_responder/test_spdm_responder_csr/csr.c  | 5 ++---
 .../test_responder/test_spdm_responder_digests/digests.c  | 5 ++---
 .../test_spdm_responder_encap_challenge/encap_challenge.c | 5 ++---
 .../encap_get_certificate.c                               | 5 ++---
 .../encap_get_digests.c                                   | 5 ++---
 .../encap_key_update.c                                    | 5 ++---
 .../test_spdm_responder_encap_response/encap_response.c   | 5 ++---
 .../test_spdm_responder_end_session/end_session.c         | 5 ++---
 .../test_spdm_responder_finish_rsp/finish_rsp.c           | 5 ++---
 .../test_spdm_responder_heartbeat_ack/heartbeat_ack.c     | 5 ++---
 .../test_spdm_responder_if_ready/respond_if_ready.c       | 5 ++---
 .../test_spdm_responder_key_exchange/key_exchange.c       | 5 ++---
 .../test_spdm_responder_key_update/key_update.c           | 5 ++---
 .../measurement_extension_log.c                           | 5 ++---
 .../test_spdm_responder_measurements/measurements.c       | 5 ++---
 .../psk_exchange_rsp.c                                    | 5 ++---
 .../test_spdm_responder_psk_finish_rsp/psk_finish_rsp.c   | 5 ++---
 .../set_certificate_rsp.c                                 | 5 ++---
 .../event_types.c                                         | 5 ++---
 .../test_spdm_responder_vendor_cmds/vendor_cmds.c         | 5 ++---
 .../test_responder/test_spdm_responder_version/version.c  | 5 ++---
 .../spdm_decode_secured_message.c                         | 5 ++---
 .../spdm_encode_secured_message.c                         | 5 ++---
 .../test_process_opaque_data_supported_version_data.c     | 5 ++---
 .../test_x509_certificate_check/x509_certificate_check.c  | 5 ++---
 .../spdm_transport_mctp_decode_message.c                  | 5 ++---
 .../transport_mctp_encode_message.c                       | 5 ++---
 .../spdm_transport_pci_doe_decode_message.c               | 5 ++---
 .../spdm_transport_pci_doe_encode_message.c               | 5 ++---
 unit_test/fuzzing/tool/transfer_ktest_to_seed.py          | 8 ++++----
 unit_test/include/library/spdm_transport_test_lib.h       | 5 ++---
 unit_test/spdm_transport_test_lib/common.c                | 5 ++---
 unit_test/spdm_transport_test_lib/test.c                  | 5 ++---
 unit_test/spdm_unit_test_common/algo.c                    | 5 ++---
 unit_test/spdm_unit_test_common/common.c                  | 5 ++---
 unit_test/spdm_unit_test_common/spdm_unit_test.h          | 5 ++---
 unit_test/spdm_unit_test_common/support.c                 | 5 ++---
 unit_test/test_crypt/aead_verify.c                        | 5 ++---
 unit_test/test_crypt/dh_verify.c                          | 5 ++---
 unit_test/test_crypt/ec_verify.c                          | 5 ++---
 unit_test/test_crypt/ec_verify2.c                         | 5 ++---
 unit_test/test_crypt/ecd_verify.c                         | 5 ++---
 unit_test/test_crypt/ecd_verify2.c                        | 5 ++---
 unit_test/test_crypt/hash_verify.c                        | 5 ++---
 unit_test/test_crypt/hkdf_verify.c                        | 5 ++---
 unit_test/test_crypt/hmac_verify.c                        | 5 ++---
 unit_test/test_crypt/os_support.c                         | 5 ++---
 unit_test/test_crypt/rand_verify.c                        | 5 ++---
 unit_test/test_crypt/rsa_verify.c                         | 5 ++---
 unit_test/test_crypt/rsa_verify2.c                        | 5 ++---
 unit_test/test_crypt/sm2_verify.c                         | 5 ++---
 unit_test/test_crypt/sm2_verify2.c                        | 5 ++---
 unit_test/test_crypt/test_crypt.c                         | 5 ++---
 unit_test/test_crypt/test_crypt.h                         | 5 ++---
 unit_test/test_crypt/x509_verify.c                        | 5 ++---
 unit_test/test_size/cryptstublib_dummy/rand_dummy.c       | 5 ++---
 unit_test/test_size/cryptstublib_dummy/timeclock_dummy.c  | 5 ++---
 unit_test/test_size/intrinsiclib/ashldi3.c                | 5 ++---
 unit_test/test_size/intrinsiclib/compiler_stub.c          | 5 ++---
 unit_test/test_size/intrinsiclib/ia32/math_div_s64x64.c   | 5 ++---
 .../intrinsiclib/ia32/math_div_s64x64_remainder.c         | 5 ++---
 unit_test/test_size/intrinsiclib/ia32/math_div_u64x64.c   | 5 ++---
 .../intrinsiclib/ia32/math_div_u64x64_remainder.c         | 5 ++---
 unit_test/test_size/intrinsiclib/ia32/math_ftol.c         | 5 ++---
 unit_test/test_size/intrinsiclib/ia32/math_lshift_s64.c   | 5 ++---
 unit_test/test_size/intrinsiclib/ia32/math_mult_s64x64.c  | 5 ++---
 .../test_size/intrinsiclib/ia32/math_remainder_s64x64.c   | 5 ++---
 .../test_size/intrinsiclib/ia32/math_remainder_u64x64.c   | 5 ++---
 unit_test/test_size/intrinsiclib/ia32/math_rshift_s64.c   | 5 ++---
 unit_test/test_size/intrinsiclib/ia32/math_rshift_u64.c   | 5 ++---
 unit_test/test_size/intrinsiclib/memory_intrinsics.c      | 5 ++---
 unit_test/test_size/malloclib_null/malloclib.c            | 5 ++---
 unit_test/test_size/malloclib_simple/malloclib.c          | 5 ++---
 unit_test/test_size/rnglib_null/rnglib.c                  | 5 ++---
 .../test_size_of_spdm_requester/spdm_requester.h          | 5 ++---
 .../spdm_requester_authentication.c                       | 5 ++---
 .../test_size_of_spdm_requester/spdm_requester_init.c     | 5 ++---
 .../test_size_of_spdm_requester/spdm_requester_main.c     | 5 ++---
 .../test_size_of_spdm_requester/spdm_requester_session.c  | 5 ++---
 unit_test/test_size/test_size_of_spdm_requester/support.c | 5 ++---
 .../test_size_of_spdm_responder/spdm_responder.h          | 5 ++---
 .../test_size_of_spdm_responder/spdm_responder_init.c     | 5 ++---
 .../test_size_of_spdm_responder/spdm_responder_main.c     | 5 ++---
 unit_test/test_size/test_size_of_spdm_responder/support.c | 5 ++---
 unit_test/test_spdm_common/context_data.c                 | 5 ++---
 unit_test/test_spdm_common/support.c                      | 5 +++++
 unit_test/test_spdm_common/test_spdm_common.c             | 5 ++---
 unit_test/test_spdm_crypt/test_spdm_crypt.c               | 5 ++---
 unit_test/test_spdm_fips/test_spdm_fips.c                 | 5 ++---
 unit_test/test_spdm_requester/challenge.c                 | 5 ++---
 unit_test/test_spdm_requester/chunk_get.c                 | 5 ++---
 unit_test/test_spdm_requester/chunk_send.c                | 5 ++---
 unit_test/test_spdm_requester/encap_certificate.c         | 6 ++----
 unit_test/test_spdm_requester/encap_challenge_auth.c      | 5 ++---
 unit_test/test_spdm_requester/encap_digests.c             | 5 ++---
 unit_test/test_spdm_requester/encap_key_update.c          | 5 ++---
 unit_test/test_spdm_requester/encap_request.c             | 5 ++---
 unit_test/test_spdm_requester/end_session.c               | 5 ++---
 .../test_spdm_requester/error_test/get_capabilities_err.c | 5 ++---
 .../test_spdm_requester/error_test/get_digests_err.c      | 5 ++---
 .../test_spdm_requester/error_test/get_event_types_err.c  | 5 ++---
 .../test_spdm_requester/error_test/get_measurements_err.c | 5 ++---
 .../test_spdm_requester/error_test/get_version_err.c      | 5 ++---
 .../test_spdm_requester/error_test/key_exchange_err.c     | 5 ++---
 .../error_test/negotiate_algorithms_err.c                 | 5 ++---
 .../test_spdm_requester/error_test/vendor_request_err.c   | 5 ++---
 unit_test/test_spdm_requester/finish.c                    | 5 ++---
 unit_test/test_spdm_requester/get_capabilities.c          | 5 ++---
 unit_test/test_spdm_requester/get_certificate.c           | 5 ++---
 unit_test/test_spdm_requester/get_csr.c                   | 5 ++---
 unit_test/test_spdm_requester/get_digests.c               | 5 ++---
 unit_test/test_spdm_requester/get_event_types.c           | 5 ++---
 .../test_spdm_requester/get_measurement_extension_log.c   | 5 ++---
 unit_test/test_spdm_requester/get_measurements.c          | 5 ++---
 unit_test/test_spdm_requester/get_version.c               | 5 ++---
 unit_test/test_spdm_requester/heartbeat.c                 | 5 ++---
 unit_test/test_spdm_requester/key_exchange.c              | 5 ++---
 unit_test/test_spdm_requester/key_update.c                | 5 ++---
 unit_test/test_spdm_requester/negotiate_algorithms.c      | 5 ++---
 unit_test/test_spdm_requester/psk_exchange.c              | 5 ++---
 unit_test/test_spdm_requester/psk_finish.c                | 5 ++---
 unit_test/test_spdm_requester/set_certificate.c           | 5 ++---
 unit_test/test_spdm_requester/test_spdm_requester.c       | 5 ++---
 unit_test/test_spdm_requester/vendor_request.c            | 5 ++---
 unit_test/test_spdm_responder/algorithms.c                | 5 ++---
 unit_test/test_spdm_responder/capabilities.c              | 5 ++---
 unit_test/test_spdm_responder/certificate.c               | 5 ++---
 unit_test/test_spdm_responder/challenge_auth.c            | 5 ++---
 unit_test/test_spdm_responder/chunk_get.c                 | 5 ++---
 unit_test/test_spdm_responder/chunk_send_ack.c            | 5 ++---
 unit_test/test_spdm_responder/csr.c                       | 5 ++---
 unit_test/test_spdm_responder/digests.c                   | 5 ++---
 unit_test/test_spdm_responder/encap_challenge.c           | 5 ++---
 unit_test/test_spdm_responder/encap_get_certificate.c     | 5 ++---
 unit_test/test_spdm_responder/encap_get_digests.c         | 7 +++----
 unit_test/test_spdm_responder/encap_key_update.c          | 5 ++---
 unit_test/test_spdm_responder/encap_response.c            | 5 ++---
 unit_test/test_spdm_responder/end_session.c               | 5 ++---
 .../error_test/supported_event_types_err.c                | 5 ++---
 .../test_spdm_responder/error_test/vendor_response_err.c  | 5 ++---
 unit_test/test_spdm_responder/finish.c                    | 5 ++---
 unit_test/test_spdm_responder/heartbeat.c                 | 5 ++---
 unit_test/test_spdm_responder/key_exchange.c              | 5 ++---
 unit_test/test_spdm_responder/key_update.c                | 5 ++---
 unit_test/test_spdm_responder/measurement_extension_log.c | 5 ++---
 unit_test/test_spdm_responder/measurements.c              | 5 ++---
 unit_test/test_spdm_responder/psk_exchange.c              | 5 ++---
 unit_test/test_spdm_responder/psk_finish.c                | 5 ++---
 unit_test/test_spdm_responder/receive_send.c              | 5 ++---
 unit_test/test_spdm_responder/respond_if_ready.c          | 5 ++---
 unit_test/test_spdm_responder/set_certificate_rsp.c       | 5 ++---
 unit_test/test_spdm_responder/supported_event_types.c     | 5 ++---
 unit_test/test_spdm_responder/test_spdm_responder.c       | 5 ++---
 unit_test/test_spdm_responder/vendor_response.c           | 5 ++---
 unit_test/test_spdm_responder/version.c                   | 5 ++---
 unit_test/test_spdm_sample/test_spdm_sample.c             | 5 ++---
 unit_test/test_spdm_secured_message/encode_decode.c       | 5 ++---
 .../test_spdm_secured_message/test_spdm_secured_message.c | 5 ++---
 474 files changed, 956 insertions(+), 1424 deletions(-)

diff --git a/include/hal/base.h b/include/hal/base.h
index 096d1728537..e92879245c8 100644
--- a/include/hal/base.h
+++ b/include/hal/base.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef BASE_H
diff --git a/include/hal/library/cryptlib.h b/include/hal/library/cryptlib.h
index 94be6652e7e..6094a3e95ad 100644
--- a/include/hal/library/cryptlib.h
+++ b/include/hal/library/cryptlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/hal/library/cryptlib/cryptlib_aead.h b/include/hal/library/cryptlib/cryptlib_aead.h
index 3d8f64535b9..4b41ddd306a 100644
--- a/include/hal/library/cryptlib/cryptlib_aead.h
+++ b/include/hal/library/cryptlib/cryptlib_aead.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_AEAD_H
diff --git a/include/hal/library/cryptlib/cryptlib_cert.h b/include/hal/library/cryptlib/cryptlib_cert.h
index c7e4cfedbf7..91826955d17 100644
--- a/include/hal/library/cryptlib/cryptlib_cert.h
+++ b/include/hal/library/cryptlib/cryptlib_cert.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_CERT_H
diff --git a/include/hal/library/cryptlib/cryptlib_dh.h b/include/hal/library/cryptlib/cryptlib_dh.h
index 779c470153c..0bcdb99d928 100644
--- a/include/hal/library/cryptlib/cryptlib_dh.h
+++ b/include/hal/library/cryptlib/cryptlib_dh.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_DH_H
diff --git a/include/hal/library/cryptlib/cryptlib_ec.h b/include/hal/library/cryptlib/cryptlib_ec.h
index 75389a06bc9..1e5c4178e49 100644
--- a/include/hal/library/cryptlib/cryptlib_ec.h
+++ b/include/hal/library/cryptlib/cryptlib_ec.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_EC_H
diff --git a/include/hal/library/cryptlib/cryptlib_ecd.h b/include/hal/library/cryptlib/cryptlib_ecd.h
index 74e3bca319e..f874c50c44d 100644
--- a/include/hal/library/cryptlib/cryptlib_ecd.h
+++ b/include/hal/library/cryptlib/cryptlib_ecd.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_ECD_H
diff --git a/include/hal/library/cryptlib/cryptlib_hash.h b/include/hal/library/cryptlib/cryptlib_hash.h
index e59c5671c7b..97e7fc2d50b 100644
--- a/include/hal/library/cryptlib/cryptlib_hash.h
+++ b/include/hal/library/cryptlib/cryptlib_hash.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_HASH_H
diff --git a/include/hal/library/cryptlib/cryptlib_hkdf.h b/include/hal/library/cryptlib/cryptlib_hkdf.h
index 5ed5ce0c3e2..5238bdaa467 100644
--- a/include/hal/library/cryptlib/cryptlib_hkdf.h
+++ b/include/hal/library/cryptlib/cryptlib_hkdf.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_HKDF_H
diff --git a/include/hal/library/cryptlib/cryptlib_mac.h b/include/hal/library/cryptlib/cryptlib_mac.h
index d9d8bc3553a..4718692d58e 100644
--- a/include/hal/library/cryptlib/cryptlib_mac.h
+++ b/include/hal/library/cryptlib/cryptlib_mac.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_MAC_H
diff --git a/include/hal/library/cryptlib/cryptlib_rng.h b/include/hal/library/cryptlib/cryptlib_rng.h
index 7da2bbb4ccf..45203024dca 100644
--- a/include/hal/library/cryptlib/cryptlib_rng.h
+++ b/include/hal/library/cryptlib/cryptlib_rng.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_RNG_H
diff --git a/include/hal/library/cryptlib/cryptlib_rsa.h b/include/hal/library/cryptlib/cryptlib_rsa.h
index b7e68a3649b..e5a53196fb3 100644
--- a/include/hal/library/cryptlib/cryptlib_rsa.h
+++ b/include/hal/library/cryptlib/cryptlib_rsa.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_RSA_H
diff --git a/include/hal/library/cryptlib/cryptlib_sm2.h b/include/hal/library/cryptlib/cryptlib_sm2.h
index b733331892c..a2d8b31b65c 100644
--- a/include/hal/library/cryptlib/cryptlib_sm2.h
+++ b/include/hal/library/cryptlib/cryptlib_sm2.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_SM2_H
diff --git a/include/hal/library/debuglib.h b/include/hal/library/debuglib.h
index 6fe45150e0b..7dba88c6d1a 100644
--- a/include/hal/library/debuglib.h
+++ b/include/hal/library/debuglib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef DEBUG_LIB_H
diff --git a/include/hal/library/eventlib.h b/include/hal/library/eventlib.h
index d322b4dd402..021bf512844 100644
--- a/include/hal/library/eventlib.h
+++ b/include/hal/library/eventlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef EVENTLIB_H
diff --git a/include/hal/library/memlib.h b/include/hal/library/memlib.h
index 3edde9a6d4e..5acdf291fbb 100644
--- a/include/hal/library/memlib.h
+++ b/include/hal/library/memlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /**
diff --git a/include/hal/library/requester/psklib.h b/include/hal/library/requester/psklib.h
index cc9b5a0b76c..b8a2d83bd9b 100644
--- a/include/hal/library/requester/psklib.h
+++ b/include/hal/library/requester/psklib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef REQUESTER_PSKLIB_H
diff --git a/include/hal/library/requester/reqasymsignlib.h b/include/hal/library/requester/reqasymsignlib.h
index f8348a38489..75f37ee7963 100644
--- a/include/hal/library/requester/reqasymsignlib.h
+++ b/include/hal/library/requester/reqasymsignlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef REQUESTER_REQASYMSIGNLIB_H
diff --git a/include/hal/library/requester/timelib.h b/include/hal/library/requester/timelib.h
index faab129ea44..3318d6b0b0b 100644
--- a/include/hal/library/requester/timelib.h
+++ b/include/hal/library/requester/timelib.h
@@ -1,8 +1,8 @@
 /**
- *  Copyright Notice:
- *  Copyright 2022-2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
+
 #ifndef REQUESTER_TIMELIB_H
 #define REQUESTER_TIMELIB_H
 
diff --git a/include/hal/library/responder/asymsignlib.h b/include/hal/library/responder/asymsignlib.h
index 9b832f6050d..149df920cc6 100644
--- a/include/hal/library/responder/asymsignlib.h
+++ b/include/hal/library/responder/asymsignlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef RESPONDER_ASYMSIGNLIB_H
diff --git a/include/hal/library/responder/csrlib.h b/include/hal/library/responder/csrlib.h
index 67b33dcc7bc..c01f6d5e3ad 100644
--- a/include/hal/library/responder/csrlib.h
+++ b/include/hal/library/responder/csrlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef RESPONDER_CSRLIB_H
diff --git a/include/hal/library/responder/measlib.h b/include/hal/library/responder/measlib.h
index ac2a7c6e7d7..415d2b70ce2 100644
--- a/include/hal/library/responder/measlib.h
+++ b/include/hal/library/responder/measlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef RESPONDER_MEASLIB_H
diff --git a/include/hal/library/responder/psklib.h b/include/hal/library/responder/psklib.h
index c6aa0b29b6a..37bf8e1dc8a 100644
--- a/include/hal/library/responder/psklib.h
+++ b/include/hal/library/responder/psklib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef RESPONDER_PSKLIB_H
diff --git a/include/hal/library/responder/setcertlib.h b/include/hal/library/responder/setcertlib.h
index 016e9a8e9bf..861171a7afa 100644
--- a/include/hal/library/responder/setcertlib.h
+++ b/include/hal/library/responder/setcertlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef RESPONDER_SETCERTLIB_H
diff --git a/include/hal/library/responder/watchdoglib.h b/include/hal/library/responder/watchdoglib.h
index 31df420849c..184bc14e1ac 100644
--- a/include/hal/library/responder/watchdoglib.h
+++ b/include/hal/library/responder/watchdoglib.h
@@ -1,8 +1,8 @@
 /**
- *  Copyright Notice:
- *  Copyright 2022-2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
+
 #ifndef REQUESTER_WATCHDOGLIB_H
 #define REQUESTER_WATCHDOGLIB_H
 
diff --git a/include/industry_standard/cxl_idekm.h b/include/industry_standard/cxl_idekm.h
index 29a00177a84..41f5d5a00ac 100644
--- a/include/industry_standard/cxl_idekm.h
+++ b/include/industry_standard/cxl_idekm.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/industry_standard/mctp.h b/include/industry_standard/mctp.h
index 3e64e164711..14ccf8ef9b6 100644
--- a/include/industry_standard/mctp.h
+++ b/include/industry_standard/mctp.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/industry_standard/pci_idekm.h b/include/industry_standard/pci_idekm.h
index 5d62ef7290b..ad7e32595ed 100644
--- a/include/industry_standard/pci_idekm.h
+++ b/include/industry_standard/pci_idekm.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/industry_standard/pci_tdisp.h b/include/industry_standard/pci_tdisp.h
index 2deb9d4bcd2..9a44276d2b3 100644
--- a/include/industry_standard/pci_tdisp.h
+++ b/include/industry_standard/pci_tdisp.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/industry_standard/pcidoe.h b/include/industry_standard/pcidoe.h
index 0ba828721fc..ac4fb079baa 100644
--- a/include/industry_standard/pcidoe.h
+++ b/include/industry_standard/pcidoe.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/industry_standard/pldm.h b/include/industry_standard/pldm.h
index ed42e70edaa..b04c0f078d7 100644
--- a/include/industry_standard/pldm.h
+++ b/include/industry_standard/pldm.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/industry_standard/spdm.h b/include/industry_standard/spdm.h
index ae7a0c617c3..0c4bfdbba27 100644
--- a/include/industry_standard/spdm.h
+++ b/include/industry_standard/spdm.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/industry_standard/spdm_secured_message.h b/include/industry_standard/spdm_secured_message.h
index e0e054df90c..d8e3d713417 100644
--- a/include/industry_standard/spdm_secured_message.h
+++ b/include/industry_standard/spdm_secured_message.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/include/internal/libspdm_common_lib.h b/include/internal/libspdm_common_lib.h
index 5fe01a79c6f..f0f3a84cc2b 100644
--- a/include/internal/libspdm_common_lib.h
+++ b/include/internal/libspdm_common_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_COMMON_LIB_INTERNAL_H
diff --git a/include/internal/libspdm_crypt_lib.h b/include/internal/libspdm_crypt_lib.h
index ee72761a29e..91b16ddd4b0 100644
--- a/include/internal/libspdm_crypt_lib.h
+++ b/include/internal/libspdm_crypt_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_crypt_lib.h"
diff --git a/include/internal/libspdm_fips_lib.h b/include/internal/libspdm_fips_lib.h
index 30f338b1978..a80991198f6 100644
--- a/include/internal/libspdm_fips_lib.h
+++ b/include/internal/libspdm_fips_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #if LIBSPDM_FIPS_MODE
diff --git a/include/internal/libspdm_lib_config.h b/include/internal/libspdm_lib_config.h
index bab6e7ac8a3..93a8d21418c 100644
--- a/include/internal/libspdm_lib_config.h
+++ b/include/internal/libspdm_lib_config.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef LIBSPDM_LIB_CONFIG_H
diff --git a/include/internal/libspdm_macro_check.h b/include/internal/libspdm_macro_check.h
index 3bb8e669a4d..db452479c70 100644
--- a/include/internal/libspdm_macro_check.h
+++ b/include/internal/libspdm_macro_check.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef LIBSPDM_MACRO_CHECK_H
diff --git a/include/internal/libspdm_requester_lib.h b/include/internal/libspdm_requester_lib.h
index f5f841134ea..0c4c2d37e4b 100644
--- a/include/internal/libspdm_requester_lib.h
+++ b/include/internal/libspdm_requester_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_REQUESTER_LIB_INTERNAL_H
diff --git a/include/internal/libspdm_responder_lib.h b/include/internal/libspdm_responder_lib.h
index 5b9032e3da5..ac0b28f2d3b 100644
--- a/include/internal/libspdm_responder_lib.h
+++ b/include/internal/libspdm_responder_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_RESPONDER_LIB_INTERNAL_H
diff --git a/include/internal/libspdm_secured_message_lib.h b/include/internal/libspdm_secured_message_lib.h
index 55d98fe8928..88ecd8771e9 100644
--- a/include/internal/libspdm_secured_message_lib.h
+++ b/include/internal/libspdm_secured_message_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_SECURED_MESSAGE_LIB_INTERNAL_H
diff --git a/include/library/spdm_common_lib.h b/include/library/spdm_common_lib.h
index 6a4c4ff195e..cfcc966c186 100644
--- a/include/library/spdm_common_lib.h
+++ b/include/library/spdm_common_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_COMMON_LIB_H
diff --git a/include/library/spdm_crypt_lib.h b/include/library/spdm_crypt_lib.h
index 835c57e7617..27f5a942057 100644
--- a/include/library/spdm_crypt_lib.h
+++ b/include/library/spdm_crypt_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_CRYPT_LIB_H
diff --git a/include/library/spdm_lib_config.h b/include/library/spdm_lib_config.h
index 826cc0bd574..b2a2e1892fb 100644
--- a/include/library/spdm_lib_config.h
+++ b/include/library/spdm_lib_config.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_LIB_CONFIG_H
diff --git a/include/library/spdm_requester_lib.h b/include/library/spdm_requester_lib.h
index 83c8f66d715..871fd426a2e 100644
--- a/include/library/spdm_requester_lib.h
+++ b/include/library/spdm_requester_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_REQUESTER_LIB_H
diff --git a/include/library/spdm_responder_lib.h b/include/library/spdm_responder_lib.h
index b2ecf5c3634..d65d2f94c72 100644
--- a/include/library/spdm_responder_lib.h
+++ b/include/library/spdm_responder_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_RESPONDER_LIB_H
diff --git a/include/library/spdm_return_status.h b/include/library/spdm_return_status.h
index 708c16d9171..42c8f895bf1 100644
--- a/include/library/spdm_return_status.h
+++ b/include/library/spdm_return_status.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_RETURN_STATUS_H
diff --git a/include/library/spdm_secured_message_lib.h b/include/library/spdm_secured_message_lib.h
index 3a7423e41ed..d0415621548 100644
--- a/include/library/spdm_secured_message_lib.h
+++ b/include/library/spdm_secured_message_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_SECURED_MESSAGE_LIB_H
diff --git a/include/library/spdm_transport_mctp_lib.h b/include/library/spdm_transport_mctp_lib.h
index f95f460d462..8d411fc78bb 100644
--- a/include/library/spdm_transport_mctp_lib.h
+++ b/include/library/spdm_transport_mctp_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_MCTP_TRANSPORT_LIB_H
diff --git a/include/library/spdm_transport_pcidoe_lib.h b/include/library/spdm_transport_pcidoe_lib.h
index de760426ae3..6362e899ab6 100644
--- a/include/library/spdm_transport_pcidoe_lib.h
+++ b/include/library/spdm_transport_pcidoe_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef PCI_DOE_TRANSPORT_LIB_H
diff --git a/library/spdm_common_lib/libspdm_com_context_data.c b/library/spdm_common_lib/libspdm_com_context_data.c
index e1f913bd111..9ce0097498e 100644
--- a/library/spdm_common_lib/libspdm_com_context_data.c
+++ b/library/spdm_common_lib/libspdm_com_context_data.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_common_lib.h"
diff --git a/library/spdm_common_lib/libspdm_com_context_data_session.c b/library/spdm_common_lib/libspdm_com_context_data_session.c
index 60dc5c47891..0cd5d1bb4c0 100644
--- a/library/spdm_common_lib/libspdm_com_context_data_session.c
+++ b/library/spdm_common_lib/libspdm_com_context_data_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_secured_message_lib.h"
diff --git a/library/spdm_common_lib/libspdm_com_crypto_service.c b/library/spdm_common_lib/libspdm_com_crypto_service.c
index 8f71e78e71c..c0aeb82c27b 100644
--- a/library/spdm_common_lib/libspdm_com_crypto_service.c
+++ b/library/spdm_common_lib/libspdm_com_crypto_service.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_common_lib.h"
diff --git a/library/spdm_common_lib/libspdm_com_crypto_service_session.c b/library/spdm_common_lib/libspdm_com_crypto_service_session.c
index afd5365d8fa..7273c55e104 100644
--- a/library/spdm_common_lib/libspdm_com_crypto_service_session.c
+++ b/library/spdm_common_lib/libspdm_com_crypto_service_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_secured_message_lib.h"
diff --git a/library/spdm_common_lib/libspdm_com_msg_log.c b/library/spdm_common_lib/libspdm_com_msg_log.c
index e2380984696..51b58f82439 100644
--- a/library/spdm_common_lib/libspdm_com_msg_log.c
+++ b/library/spdm_common_lib/libspdm_com_msg_log.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_common_lib.h"
diff --git a/library/spdm_common_lib/libspdm_com_opaque_data.c b/library/spdm_common_lib/libspdm_com_opaque_data.c
index 8bc19c4e3cf..fc9a013d85a 100644
--- a/library/spdm_common_lib/libspdm_com_opaque_data.c
+++ b/library/spdm_common_lib/libspdm_com_opaque_data.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_common_lib.h"
diff --git a/library/spdm_common_lib/libspdm_com_support.c b/library/spdm_common_lib/libspdm_com_support.c
index 025624c6266..039aa70e452 100644
--- a/library/spdm_common_lib/libspdm_com_support.c
+++ b/library/spdm_common_lib/libspdm_com_support.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_common_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest.c b/library/spdm_crypt_lib/fips/libspdm_selftest.c
index 5a60e7d5448..794fa8019ed 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c b/library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c
index d2514cf9b79..044f4694594 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_aes_gcm.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c b/library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c
index b3c074efe0e..b6a20090dac 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_ecdh.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c b/library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c
index 4021f346af7..74c75baf097 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_ecdsa.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c b/library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c
index 71851c57f4f..63b79bc42a6 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_eddsa.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c b/library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c
index 4e64c19a7ce..95a45db93a1 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_ffdh.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c b/library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c
index 48a16503d6a..57ca7f3c9c9 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_hkdf.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c b/library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c
index 882381c35b3..4a69988ff83 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_hmac.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c b/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c
index bf457f9213d..7ad6417e88a 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_pss.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c b/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c
index fa76843d479..8dca8bd59b5 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_rsa_ssa.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c b/library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c
index e9e4fa805c5..be2b6b800fc 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_sha2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c b/library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c
index 64f8c842eaa..fc7eea1d734 100644
--- a/library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c
+++ b/library/spdm_crypt_lib/fips/libspdm_selftest_sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_aead.c b/library/spdm_crypt_lib/libspdm_crypt_aead.c
index 04eaa8ce506..0186a541d13 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_aead.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_aead.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_asym.c b/library/spdm_crypt_lib/libspdm_crypt_asym.c
index 805bca34ca1..979aeac86fc 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_asym.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_asym.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_cert.c b/library/spdm_crypt_lib/libspdm_crypt_cert.c
index 424b9549c43..163e94ecb76 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_cert.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_cert.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_dhe.c b/library/spdm_crypt_lib/libspdm_crypt_dhe.c
index 4f8db50d260..d7b29403b29 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_dhe.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_dhe.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_hash.c b/library/spdm_crypt_lib/libspdm_crypt_hash.c
index 44f3a25732e..97766424fde 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_hash.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_hash.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_hkdf.c b/library/spdm_crypt_lib/libspdm_crypt_hkdf.c
index 3f7b22b7c63..ec7123db681 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_hkdf.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_hkdf.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_hmac.c b/library/spdm_crypt_lib/libspdm_crypt_hmac.c
index 56f8b0efeac..71648bbadc1 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_hmac.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_hmac.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_crypt_lib/libspdm_crypt_rng.c b/library/spdm_crypt_lib/libspdm_crypt_rng.c
index 4e352067057..7ddd8da48a1 100644
--- a/library/spdm_crypt_lib/libspdm_crypt_rng.c
+++ b/library/spdm_crypt_lib/libspdm_crypt_rng.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_crypt_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_challenge.c b/library/spdm_requester_lib/libspdm_req_challenge.c
index b1d7da08e5a..e879f1748cc 100644
--- a/library/spdm_requester_lib/libspdm_req_challenge.c
+++ b/library/spdm_requester_lib/libspdm_req_challenge.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_common.c b/library/spdm_requester_lib/libspdm_req_common.c
index f900634c96c..7d4081c9a96 100644
--- a/library/spdm_requester_lib/libspdm_req_common.c
+++ b/library/spdm_requester_lib/libspdm_req_common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_communication.c b/library/spdm_requester_lib/libspdm_req_communication.c
index e57a39dfb23..f91e0d5602d 100644
--- a/library/spdm_requester_lib/libspdm_req_communication.c
+++ b/library/spdm_requester_lib/libspdm_req_communication.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_encap_certificate.c b/library/spdm_requester_lib/libspdm_req_encap_certificate.c
index 8e1fe31db6b..2b804265f6d 100644
--- a/library/spdm_requester_lib/libspdm_req_encap_certificate.c
+++ b/library/spdm_requester_lib/libspdm_req_encap_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_encap_challenge_auth.c b/library/spdm_requester_lib/libspdm_req_encap_challenge_auth.c
index 996a2947079..b6c79ef3921 100644
--- a/library/spdm_requester_lib/libspdm_req_encap_challenge_auth.c
+++ b/library/spdm_requester_lib/libspdm_req_encap_challenge_auth.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_encap_digests.c b/library/spdm_requester_lib/libspdm_req_encap_digests.c
index 0c4c6df3816..691423c2d97 100644
--- a/library/spdm_requester_lib/libspdm_req_encap_digests.c
+++ b/library/spdm_requester_lib/libspdm_req_encap_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_encap_error.c b/library/spdm_requester_lib/libspdm_req_encap_error.c
index 5cd4ec03820..dc982d4ed26 100644
--- a/library/spdm_requester_lib/libspdm_req_encap_error.c
+++ b/library/spdm_requester_lib/libspdm_req_encap_error.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_encap_key_update.c b/library/spdm_requester_lib/libspdm_req_encap_key_update.c
index e8eb5d5ef75..aaf41d7aeb3 100644
--- a/library/spdm_requester_lib/libspdm_req_encap_key_update.c
+++ b/library/spdm_requester_lib/libspdm_req_encap_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_encap_request.c b/library/spdm_requester_lib/libspdm_req_encap_request.c
index f8b3a35e073..35d1168982a 100644
--- a/library/spdm_requester_lib/libspdm_req_encap_request.c
+++ b/library/spdm_requester_lib/libspdm_req_encap_request.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_end_session.c b/library/spdm_requester_lib/libspdm_req_end_session.c
index 6e7fd82e9f8..cdc547412f6 100644
--- a/library/spdm_requester_lib/libspdm_req_end_session.c
+++ b/library/spdm_requester_lib/libspdm_req_end_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_finish.c b/library/spdm_requester_lib/libspdm_req_finish.c
index f3cf371aba5..2d9806cec01 100644
--- a/library/spdm_requester_lib/libspdm_req_finish.c
+++ b/library/spdm_requester_lib/libspdm_req_finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_capabilities.c b/library/spdm_requester_lib/libspdm_req_get_capabilities.c
index 356bc36cf64..f78d79912b7 100644
--- a/library/spdm_requester_lib/libspdm_req_get_capabilities.c
+++ b/library/spdm_requester_lib/libspdm_req_get_capabilities.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_certificate.c b/library/spdm_requester_lib/libspdm_req_get_certificate.c
index d276411505f..8059927c085 100644
--- a/library/spdm_requester_lib/libspdm_req_get_certificate.c
+++ b/library/spdm_requester_lib/libspdm_req_get_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_csr.c b/library/spdm_requester_lib/libspdm_req_get_csr.c
index 1c7abfe02e2..d4cf8bdaf29 100644
--- a/library/spdm_requester_lib/libspdm_req_get_csr.c
+++ b/library/spdm_requester_lib/libspdm_req_get_csr.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_digests.c b/library/spdm_requester_lib/libspdm_req_get_digests.c
index dc289f59941..af05cfcfc8f 100644
--- a/library/spdm_requester_lib/libspdm_req_get_digests.c
+++ b/library/spdm_requester_lib/libspdm_req_get_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_event_types.c b/library/spdm_requester_lib/libspdm_req_get_event_types.c
index 2b887dc2ac8..b1d7c30f45b 100644
--- a/library/spdm_requester_lib/libspdm_req_get_event_types.c
+++ b/library/spdm_requester_lib/libspdm_req_get_event_types.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_measurement_extension_log.c b/library/spdm_requester_lib/libspdm_req_get_measurement_extension_log.c
index 86c3b5f4e6d..db2e24c9df4 100644
--- a/library/spdm_requester_lib/libspdm_req_get_measurement_extension_log.c
+++ b/library/spdm_requester_lib/libspdm_req_get_measurement_extension_log.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_measurements.c b/library/spdm_requester_lib/libspdm_req_get_measurements.c
index d6d2680cd76..3b5f2bed9ec 100644
--- a/library/spdm_requester_lib/libspdm_req_get_measurements.c
+++ b/library/spdm_requester_lib/libspdm_req_get_measurements.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_get_version.c b/library/spdm_requester_lib/libspdm_req_get_version.c
index be8a014bf95..82249e24cca 100644
--- a/library/spdm_requester_lib/libspdm_req_get_version.c
+++ b/library/spdm_requester_lib/libspdm_req_get_version.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_handle_error_response.c b/library/spdm_requester_lib/libspdm_req_handle_error_response.c
index 3ee0126274c..1a9fc373e7c 100644
--- a/library/spdm_requester_lib/libspdm_req_handle_error_response.c
+++ b/library/spdm_requester_lib/libspdm_req_handle_error_response.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_heartbeat.c b/library/spdm_requester_lib/libspdm_req_heartbeat.c
index 2844006b55c..ead489f13cf 100644
--- a/library/spdm_requester_lib/libspdm_req_heartbeat.c
+++ b/library/spdm_requester_lib/libspdm_req_heartbeat.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_key_exchange.c b/library/spdm_requester_lib/libspdm_req_key_exchange.c
index bf7534c20c7..50656a177a0 100644
--- a/library/spdm_requester_lib/libspdm_req_key_exchange.c
+++ b/library/spdm_requester_lib/libspdm_req_key_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_key_update.c b/library/spdm_requester_lib/libspdm_req_key_update.c
index 48f35bb6e78..ea0140eceb5 100644
--- a/library/spdm_requester_lib/libspdm_req_key_update.c
+++ b/library/spdm_requester_lib/libspdm_req_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_negotiate_algorithms.c b/library/spdm_requester_lib/libspdm_req_negotiate_algorithms.c
index 5a8ab9c0ba0..764e93f2818 100644
--- a/library/spdm_requester_lib/libspdm_req_negotiate_algorithms.c
+++ b/library/spdm_requester_lib/libspdm_req_negotiate_algorithms.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_psk_exchange.c b/library/spdm_requester_lib/libspdm_req_psk_exchange.c
index 83038cce1f8..bc8a48d4d7f 100644
--- a/library/spdm_requester_lib/libspdm_req_psk_exchange.c
+++ b/library/spdm_requester_lib/libspdm_req_psk_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_psk_finish.c b/library/spdm_requester_lib/libspdm_req_psk_finish.c
index 4204df7d987..b98f88c466a 100644
--- a/library/spdm_requester_lib/libspdm_req_psk_finish.c
+++ b/library/spdm_requester_lib/libspdm_req_psk_finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_send_receive.c b/library/spdm_requester_lib/libspdm_req_send_receive.c
index fd54d692ee4..7430868aa8a 100644
--- a/library/spdm_requester_lib/libspdm_req_send_receive.c
+++ b/library/spdm_requester_lib/libspdm_req_send_receive.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_set_certificate.c b/library/spdm_requester_lib/libspdm_req_set_certificate.c
index b13d95a2073..8755255c952 100644
--- a/library/spdm_requester_lib/libspdm_req_set_certificate.c
+++ b/library/spdm_requester_lib/libspdm_req_set_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_requester_lib/libspdm_req_vendor_request.c b/library/spdm_requester_lib/libspdm_req_vendor_request.c
index e9df4d21ab4..20b5ed2d7d6 100644
--- a/library/spdm_requester_lib/libspdm_req_vendor_request.c
+++ b/library/spdm_requester_lib/libspdm_req_vendor_request.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_algorithms.c b/library/spdm_responder_lib/libspdm_rsp_algorithms.c
index 488b1cd8de9..8a29f9993e7 100644
--- a/library/spdm_responder_lib/libspdm_rsp_algorithms.c
+++ b/library/spdm_responder_lib/libspdm_rsp_algorithms.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_capabilities.c b/library/spdm_responder_lib/libspdm_rsp_capabilities.c
index 05acbfe5f4a..7f028bb46df 100644
--- a/library/spdm_responder_lib/libspdm_rsp_capabilities.c
+++ b/library/spdm_responder_lib/libspdm_rsp_capabilities.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_certificate.c b/library/spdm_responder_lib/libspdm_rsp_certificate.c
index b862033992d..069c4c72c80 100644
--- a/library/spdm_responder_lib/libspdm_rsp_certificate.c
+++ b/library/spdm_responder_lib/libspdm_rsp_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 #include "internal/libspdm_responder_lib.h"
 
diff --git a/library/spdm_responder_lib/libspdm_rsp_challenge_auth.c b/library/spdm_responder_lib/libspdm_rsp_challenge_auth.c
index 094dfdcfa47..5ce69dec863 100644
--- a/library/spdm_responder_lib/libspdm_rsp_challenge_auth.c
+++ b/library/spdm_responder_lib/libspdm_rsp_challenge_auth.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_chunk_get.c b/library/spdm_responder_lib/libspdm_rsp_chunk_get.c
index 0fb140ee0b6..64b5e10f2a5 100644
--- a/library/spdm_responder_lib/libspdm_rsp_chunk_get.c
+++ b/library/spdm_responder_lib/libspdm_rsp_chunk_get.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_chunk_send_ack.c b/library/spdm_responder_lib/libspdm_rsp_chunk_send_ack.c
index c3ce78378e2..3e4cf2c07d7 100644
--- a/library/spdm_responder_lib/libspdm_rsp_chunk_send_ack.c
+++ b/library/spdm_responder_lib/libspdm_rsp_chunk_send_ack.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_common.c b/library/spdm_responder_lib/libspdm_rsp_common.c
index 7d12ffc1e25..37909c39575 100644
--- a/library/spdm_responder_lib/libspdm_rsp_common.c
+++ b/library/spdm_responder_lib/libspdm_rsp_common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_communication.c b/library/spdm_responder_lib/libspdm_rsp_communication.c
index dd2445cfd60..a2daca52ff1 100644
--- a/library/spdm_responder_lib/libspdm_rsp_communication.c
+++ b/library/spdm_responder_lib/libspdm_rsp_communication.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_csr.c b/library/spdm_responder_lib/libspdm_rsp_csr.c
index d4ccda94cd4..29697aa1c0c 100644
--- a/library/spdm_responder_lib/libspdm_rsp_csr.c
+++ b/library/spdm_responder_lib/libspdm_rsp_csr.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_digests.c b/library/spdm_responder_lib/libspdm_rsp_digests.c
index 72cb4b4d4d9..bd59771394e 100644
--- a/library/spdm_responder_lib/libspdm_rsp_digests.c
+++ b/library/spdm_responder_lib/libspdm_rsp_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c b/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c
index 923736869b6..1cdc9b48486 100644
--- a/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c
+++ b/library/spdm_responder_lib/libspdm_rsp_encap_challenge.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_encap_get_certificate.c b/library/spdm_responder_lib/libspdm_rsp_encap_get_certificate.c
index 8c58983c316..ded3da97f2e 100644
--- a/library/spdm_responder_lib/libspdm_rsp_encap_get_certificate.c
+++ b/library/spdm_responder_lib/libspdm_rsp_encap_get_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c b/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c
index eb671b73b75..f06503f225a 100644
--- a/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c
+++ b/library/spdm_responder_lib/libspdm_rsp_encap_get_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_encap_key_update.c b/library/spdm_responder_lib/libspdm_rsp_encap_key_update.c
index bed2848b3d0..0c476304b4c 100644
--- a/library/spdm_responder_lib/libspdm_rsp_encap_key_update.c
+++ b/library/spdm_responder_lib/libspdm_rsp_encap_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_encap_response.c b/library/spdm_responder_lib/libspdm_rsp_encap_response.c
index 0fbdea05fff..50a25832be2 100644
--- a/library/spdm_responder_lib/libspdm_rsp_encap_response.c
+++ b/library/spdm_responder_lib/libspdm_rsp_encap_response.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_end_session.c b/library/spdm_responder_lib/libspdm_rsp_end_session.c
index f3a5799b39f..eb08f9e95e7 100644
--- a/library/spdm_responder_lib/libspdm_rsp_end_session.c
+++ b/library/spdm_responder_lib/libspdm_rsp_end_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_error.c b/library/spdm_responder_lib/libspdm_rsp_error.c
index d136b911891..847af4e22d1 100644
--- a/library/spdm_responder_lib/libspdm_rsp_error.c
+++ b/library/spdm_responder_lib/libspdm_rsp_error.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_finish.c b/library/spdm_responder_lib/libspdm_rsp_finish.c
index 7d692eebb24..3d25afdec73 100644
--- a/library/spdm_responder_lib/libspdm_rsp_finish.c
+++ b/library/spdm_responder_lib/libspdm_rsp_finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_handle_response_state.c b/library/spdm_responder_lib/libspdm_rsp_handle_response_state.c
index c3bd1955e32..f2671428ec0 100644
--- a/library/spdm_responder_lib/libspdm_rsp_handle_response_state.c
+++ b/library/spdm_responder_lib/libspdm_rsp_handle_response_state.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_heartbeat.c b/library/spdm_responder_lib/libspdm_rsp_heartbeat.c
index 8e4de91a761..39a5bd81f89 100644
--- a/library/spdm_responder_lib/libspdm_rsp_heartbeat.c
+++ b/library/spdm_responder_lib/libspdm_rsp_heartbeat.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_key_exchange.c b/library/spdm_responder_lib/libspdm_rsp_key_exchange.c
index 3f8724a0c25..1b5c30c3e67 100644
--- a/library/spdm_responder_lib/libspdm_rsp_key_exchange.c
+++ b/library/spdm_responder_lib/libspdm_rsp_key_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_key_update.c b/library/spdm_responder_lib/libspdm_rsp_key_update.c
index 2379331dcf1..0343911e1b2 100644
--- a/library/spdm_responder_lib/libspdm_rsp_key_update.c
+++ b/library/spdm_responder_lib/libspdm_rsp_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_measurement_extension_log.c b/library/spdm_responder_lib/libspdm_rsp_measurement_extension_log.c
index 2c0bd241f5b..ac6c7024e1e 100644
--- a/library/spdm_responder_lib/libspdm_rsp_measurement_extension_log.c
+++ b/library/spdm_responder_lib/libspdm_rsp_measurement_extension_log.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 #include "internal/libspdm_responder_lib.h"
 
diff --git a/library/spdm_responder_lib/libspdm_rsp_measurements.c b/library/spdm_responder_lib/libspdm_rsp_measurements.c
index 9bd0094ac2c..60f16397d00 100644
--- a/library/spdm_responder_lib/libspdm_rsp_measurements.c
+++ b/library/spdm_responder_lib/libspdm_rsp_measurements.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_psk_exchange.c b/library/spdm_responder_lib/libspdm_rsp_psk_exchange.c
index 8e7968c8501..532ad62647f 100644
--- a/library/spdm_responder_lib/libspdm_rsp_psk_exchange.c
+++ b/library/spdm_responder_lib/libspdm_rsp_psk_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_psk_finish.c b/library/spdm_responder_lib/libspdm_rsp_psk_finish.c
index 1c02a1f0351..c6c94333689 100644
--- a/library/spdm_responder_lib/libspdm_rsp_psk_finish.c
+++ b/library/spdm_responder_lib/libspdm_rsp_psk_finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_receive_send.c b/library/spdm_responder_lib/libspdm_rsp_receive_send.c
index d4c3f228776..eaa95e0c278 100644
--- a/library/spdm_responder_lib/libspdm_rsp_receive_send.c
+++ b/library/spdm_responder_lib/libspdm_rsp_receive_send.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_respond_if_ready.c b/library/spdm_responder_lib/libspdm_rsp_respond_if_ready.c
index 4d463042c77..e3b4e784993 100644
--- a/library/spdm_responder_lib/libspdm_rsp_respond_if_ready.c
+++ b/library/spdm_responder_lib/libspdm_rsp_respond_if_ready.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_set_certificate.c b/library/spdm_responder_lib/libspdm_rsp_set_certificate.c
index ae5a18a4ae5..09c7eb5edfb 100644
--- a/library/spdm_responder_lib/libspdm_rsp_set_certificate.c
+++ b/library/spdm_responder_lib/libspdm_rsp_set_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_supported_event_types.c b/library/spdm_responder_lib/libspdm_rsp_supported_event_types.c
index 339cc2e6f80..772509eebcf 100644
--- a/library/spdm_responder_lib/libspdm_rsp_supported_event_types.c
+++ b/library/spdm_responder_lib/libspdm_rsp_supported_event_types.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_vendor_response.c b/library/spdm_responder_lib/libspdm_rsp_vendor_response.c
index 0e9f24aa478..e9951bf665c 100644
--- a/library/spdm_responder_lib/libspdm_rsp_vendor_response.c
+++ b/library/spdm_responder_lib/libspdm_rsp_vendor_response.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_responder_lib/libspdm_rsp_version.c b/library/spdm_responder_lib/libspdm_rsp_version.c
index 16415564f1a..2fbd18b72fa 100644
--- a/library/spdm_responder_lib/libspdm_rsp_version.c
+++ b/library/spdm_responder_lib/libspdm_rsp_version.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/library/spdm_secured_message_lib/libspdm_secmes_context_data.c b/library/spdm_secured_message_lib/libspdm_secmes_context_data.c
index 7a62c5a3f6e..61321b788e9 100644
--- a/library/spdm_secured_message_lib/libspdm_secmes_context_data.c
+++ b/library/spdm_secured_message_lib/libspdm_secmes_context_data.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_secured_message_lib.h"
diff --git a/library/spdm_secured_message_lib/libspdm_secmes_encode_decode.c b/library/spdm_secured_message_lib/libspdm_secmes_encode_decode.c
index 1d91abe23f5..dae8db49760 100644
--- a/library/spdm_secured_message_lib/libspdm_secmes_encode_decode.c
+++ b/library/spdm_secured_message_lib/libspdm_secmes_encode_decode.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_secured_message_lib.h"
diff --git a/library/spdm_secured_message_lib/libspdm_secmes_key_exchange.c b/library/spdm_secured_message_lib/libspdm_secmes_key_exchange.c
index c902317d668..056acdb0dd7 100644
--- a/library/spdm_secured_message_lib/libspdm_secmes_key_exchange.c
+++ b/library/spdm_secured_message_lib/libspdm_secmes_key_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_secured_message_lib.h"
diff --git a/library/spdm_secured_message_lib/libspdm_secmes_session.c b/library/spdm_secured_message_lib/libspdm_secmes_session.c
index 4ec08b6892d..a99aced3453 100644
--- a/library/spdm_secured_message_lib/libspdm_secmes_session.c
+++ b/library/spdm_secured_message_lib/libspdm_secmes_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_secured_message_lib.h"
diff --git a/library/spdm_transport_mctp_lib/libspdm_mctp_common.c b/library/spdm_transport_mctp_lib/libspdm_mctp_common.c
index 95ffb3bc5b6..e1f8d615451 100644
--- a/library/spdm_transport_mctp_lib/libspdm_mctp_common.c
+++ b/library/spdm_transport_mctp_lib/libspdm_mctp_common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_transport_mctp_lib.h"
diff --git a/library/spdm_transport_mctp_lib/libspdm_mctp_mctp.c b/library/spdm_transport_mctp_lib/libspdm_mctp_mctp.c
index 3c9a69af5d4..8006c3956e7 100644
--- a/library/spdm_transport_mctp_lib/libspdm_mctp_mctp.c
+++ b/library/spdm_transport_mctp_lib/libspdm_mctp_mctp.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_transport_mctp_lib.h"
diff --git a/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c b/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c
index 9b518714cb3..9c0b19d12b3 100644
--- a/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c
+++ b/library/spdm_transport_pcidoe_lib/libspdm_doe_common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_transport_pcidoe_lib.h"
diff --git a/library/spdm_transport_pcidoe_lib/libspdm_doe_pcidoe.c b/library/spdm_transport_pcidoe_lib/libspdm_doe_pcidoe.c
index 893acb5ffb5..769f32718ff 100644
--- a/library/spdm_transport_pcidoe_lib/libspdm_doe_pcidoe.c
+++ b/library/spdm_transport_pcidoe_lib/libspdm_doe_pcidoe.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_transport_pcidoe_lib.h"
diff --git a/os_stub/cryptlib_mbedtls/cipher/aead_aes_gcm.c b/os_stub/cryptlib_mbedtls/cipher/aead_aes_gcm.c
index fa0414f629c..7232ccf7b11 100644
--- a/os_stub/cryptlib_mbedtls/cipher/aead_aes_gcm.c
+++ b/os_stub/cryptlib_mbedtls/cipher/aead_aes_gcm.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/cipher/aead_chacha20_poly1305.c b/os_stub/cryptlib_mbedtls/cipher/aead_chacha20_poly1305.c
index 43cc3747a0f..52ed70ff05d 100644
--- a/os_stub/cryptlib_mbedtls/cipher/aead_chacha20_poly1305.c
+++ b/os_stub/cryptlib_mbedtls/cipher/aead_chacha20_poly1305.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/cipher/aead_sm4_gcm.c b/os_stub/cryptlib_mbedtls/cipher/aead_sm4_gcm.c
index f2ef91ecf72..54f34f58d51 100644
--- a/os_stub/cryptlib_mbedtls/cipher/aead_sm4_gcm.c
+++ b/os_stub/cryptlib_mbedtls/cipher/aead_sm4_gcm.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/der/der.c b/os_stub/cryptlib_mbedtls/der/der.c
index b904f6b3ed9..44ed1e672b1 100644
--- a/os_stub/cryptlib_mbedtls/der/der.c
+++ b/os_stub/cryptlib_mbedtls/der/der.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/hash/sha.c b/os_stub/cryptlib_mbedtls/hash/sha.c
index f5f6b0b3bee..685ca717289 100644
--- a/os_stub/cryptlib_mbedtls/hash/sha.c
+++ b/os_stub/cryptlib_mbedtls/hash/sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/hash/sha3.c b/os_stub/cryptlib_mbedtls/hash/sha3.c
index c3f15183070..a6990978d09 100644
--- a/os_stub/cryptlib_mbedtls/hash/sha3.c
+++ b/os_stub/cryptlib_mbedtls/hash/sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/hash/sm3.c b/os_stub/cryptlib_mbedtls/hash/sm3.c
index a0d101fd273..91d37177d23 100644
--- a/os_stub/cryptlib_mbedtls/hash/sm3.c
+++ b/os_stub/cryptlib_mbedtls/hash/sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/hmac/hmac_sha.c b/os_stub/cryptlib_mbedtls/hmac/hmac_sha.c
index d2b62519107..76b98360726 100644
--- a/os_stub/cryptlib_mbedtls/hmac/hmac_sha.c
+++ b/os_stub/cryptlib_mbedtls/hmac/hmac_sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/hmac/hmac_sha3.c b/os_stub/cryptlib_mbedtls/hmac/hmac_sha3.c
index f6a967e5b56..ee89367df39 100644
--- a/os_stub/cryptlib_mbedtls/hmac/hmac_sha3.c
+++ b/os_stub/cryptlib_mbedtls/hmac/hmac_sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/hmac/hmac_sm3.c b/os_stub/cryptlib_mbedtls/hmac/hmac_sm3.c
index 7d337772826..23df7ae3759 100644
--- a/os_stub/cryptlib_mbedtls/hmac/hmac_sm3.c
+++ b/os_stub/cryptlib_mbedtls/hmac/hmac_sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/internal_crypt_lib.h b/os_stub/cryptlib_mbedtls/internal_crypt_lib.h
index 43d22838633..ad9c07d1638 100644
--- a/os_stub/cryptlib_mbedtls/internal_crypt_lib.h
+++ b/os_stub/cryptlib_mbedtls/internal_crypt_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/kdf/hkdf_sha.c b/os_stub/cryptlib_mbedtls/kdf/hkdf_sha.c
index 025a64fe6c3..4319cade97b 100644
--- a/os_stub/cryptlib_mbedtls/kdf/hkdf_sha.c
+++ b/os_stub/cryptlib_mbedtls/kdf/hkdf_sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/kdf/hkdf_sha3.c b/os_stub/cryptlib_mbedtls/kdf/hkdf_sha3.c
index 752f81ac6b0..3b72e63c725 100644
--- a/os_stub/cryptlib_mbedtls/kdf/hkdf_sha3.c
+++ b/os_stub/cryptlib_mbedtls/kdf/hkdf_sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/kdf/hkdf_sm3.c b/os_stub/cryptlib_mbedtls/kdf/hkdf_sm3.c
index 5caaeeee274..b7617167bbe 100644
--- a/os_stub/cryptlib_mbedtls/kdf/hkdf_sm3.c
+++ b/os_stub/cryptlib_mbedtls/kdf/hkdf_sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pem/pem.c b/os_stub/cryptlib_mbedtls/pem/pem.c
index 7e10d758f93..fa56cceeb85 100644
--- a/os_stub/cryptlib_mbedtls/pem/pem.c
+++ b/os_stub/cryptlib_mbedtls/pem/pem.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pk/dh.c b/os_stub/cryptlib_mbedtls/pk/dh.c
index 97537d9de30..303f8c86f78 100644
--- a/os_stub/cryptlib_mbedtls/pk/dh.c
+++ b/os_stub/cryptlib_mbedtls/pk/dh.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pk/ec.c b/os_stub/cryptlib_mbedtls/pk/ec.c
index 4222e71d6cb..ca851732944 100644
--- a/os_stub/cryptlib_mbedtls/pk/ec.c
+++ b/os_stub/cryptlib_mbedtls/pk/ec.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pk/ecd.c b/os_stub/cryptlib_mbedtls/pk/ecd.c
index 8df324f6921..61cbe593149 100644
--- a/os_stub/cryptlib_mbedtls/pk/ecd.c
+++ b/os_stub/cryptlib_mbedtls/pk/ecd.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pk/rsa_basic.c b/os_stub/cryptlib_mbedtls/pk/rsa_basic.c
index abfb83092fe..eb9524763b0 100644
--- a/os_stub/cryptlib_mbedtls/pk/rsa_basic.c
+++ b/os_stub/cryptlib_mbedtls/pk/rsa_basic.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pk/rsa_ext.c b/os_stub/cryptlib_mbedtls/pk/rsa_ext.c
index d6469a5eb8b..87feacff191 100644
--- a/os_stub/cryptlib_mbedtls/pk/rsa_ext.c
+++ b/os_stub/cryptlib_mbedtls/pk/rsa_ext.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pk/sm2.c b/os_stub/cryptlib_mbedtls/pk/sm2.c
index 7148dbe6c6e..894ca47d48d 100644
--- a/os_stub/cryptlib_mbedtls/pk/sm2.c
+++ b/os_stub/cryptlib_mbedtls/pk/sm2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/pk/x509.c b/os_stub/cryptlib_mbedtls/pk/x509.c
index 46b731f7259..3d443102c29 100644
--- a/os_stub/cryptlib_mbedtls/pk/x509.c
+++ b/os_stub/cryptlib_mbedtls/pk/x509.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/rand/rand.c b/os_stub/cryptlib_mbedtls/rand/rand.c
index 0b5e2830edf..722095986c2 100644
--- a/os_stub/cryptlib_mbedtls/rand/rand.c
+++ b/os_stub/cryptlib_mbedtls/rand/rand.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/sys_call/crt_wrapper_host.c b/os_stub/cryptlib_mbedtls/sys_call/crt_wrapper_host.c
index 9ce520c7c56..5dd3b044fd9 100644
--- a/os_stub/cryptlib_mbedtls/sys_call/crt_wrapper_host.c
+++ b/os_stub/cryptlib_mbedtls/sys_call/crt_wrapper_host.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_mbedtls/sys_call/mem_allocation.c b/os_stub/cryptlib_mbedtls/sys_call/mem_allocation.c
index 1e7f4ce6ead..610f3dd3b45 100644
--- a/os_stub/cryptlib_mbedtls/sys_call/mem_allocation.c
+++ b/os_stub/cryptlib_mbedtls/sys_call/mem_allocation.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/cipher/aead_aes_gcm.c b/os_stub/cryptlib_null/cipher/aead_aes_gcm.c
index 5ef1ee05455..a45bb5cafe6 100644
--- a/os_stub/cryptlib_null/cipher/aead_aes_gcm.c
+++ b/os_stub/cryptlib_null/cipher/aead_aes_gcm.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/cipher/aead_chacha20_poly1305.c b/os_stub/cryptlib_null/cipher/aead_chacha20_poly1305.c
index 4ed3f0426f9..7fd8dfedddd 100644
--- a/os_stub/cryptlib_null/cipher/aead_chacha20_poly1305.c
+++ b/os_stub/cryptlib_null/cipher/aead_chacha20_poly1305.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/cipher/aead_sm4_gcm.c b/os_stub/cryptlib_null/cipher/aead_sm4_gcm.c
index f2ef91ecf72..54f34f58d51 100644
--- a/os_stub/cryptlib_null/cipher/aead_sm4_gcm.c
+++ b/os_stub/cryptlib_null/cipher/aead_sm4_gcm.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/der/der.c b/os_stub/cryptlib_null/der/der.c
index 1aaddb07733..dd75d1c1983 100644
--- a/os_stub/cryptlib_null/der/der.c
+++ b/os_stub/cryptlib_null/der/der.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/hash/sha.c b/os_stub/cryptlib_null/hash/sha.c
index 8125f0e5359..5f2682eae91 100644
--- a/os_stub/cryptlib_null/hash/sha.c
+++ b/os_stub/cryptlib_null/hash/sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/hash/sha3.c b/os_stub/cryptlib_null/hash/sha3.c
index 11d6975d572..4eae3511ee2 100644
--- a/os_stub/cryptlib_null/hash/sha3.c
+++ b/os_stub/cryptlib_null/hash/sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/hash/sm3.c b/os_stub/cryptlib_null/hash/sm3.c
index f5101aaedd3..c7e54397679 100644
--- a/os_stub/cryptlib_null/hash/sm3.c
+++ b/os_stub/cryptlib_null/hash/sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/hmac/hmac_sha.c b/os_stub/cryptlib_null/hmac/hmac_sha.c
index 15c30da26bf..1ec2d8de5a1 100644
--- a/os_stub/cryptlib_null/hmac/hmac_sha.c
+++ b/os_stub/cryptlib_null/hmac/hmac_sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/hmac/hmac_sha3.c b/os_stub/cryptlib_null/hmac/hmac_sha3.c
index f6a967e5b56..ee89367df39 100644
--- a/os_stub/cryptlib_null/hmac/hmac_sha3.c
+++ b/os_stub/cryptlib_null/hmac/hmac_sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/hmac/hmac_sm3.c b/os_stub/cryptlib_null/hmac/hmac_sm3.c
index 7d337772826..23df7ae3759 100644
--- a/os_stub/cryptlib_null/hmac/hmac_sm3.c
+++ b/os_stub/cryptlib_null/hmac/hmac_sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/internal_crypt_lib.h b/os_stub/cryptlib_null/internal_crypt_lib.h
index 7f6f346f7fb..db9d0d37e26 100644
--- a/os_stub/cryptlib_null/internal_crypt_lib.h
+++ b/os_stub/cryptlib_null/internal_crypt_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/kdf/hkdf_sha.c b/os_stub/cryptlib_null/kdf/hkdf_sha.c
index 4d57df23014..b94ec286f18 100644
--- a/os_stub/cryptlib_null/kdf/hkdf_sha.c
+++ b/os_stub/cryptlib_null/kdf/hkdf_sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/kdf/hkdf_sha3.c b/os_stub/cryptlib_null/kdf/hkdf_sha3.c
index 752f81ac6b0..3b72e63c725 100644
--- a/os_stub/cryptlib_null/kdf/hkdf_sha3.c
+++ b/os_stub/cryptlib_null/kdf/hkdf_sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/kdf/hkdf_sm3.c b/os_stub/cryptlib_null/kdf/hkdf_sm3.c
index 5caaeeee274..b7617167bbe 100644
--- a/os_stub/cryptlib_null/kdf/hkdf_sm3.c
+++ b/os_stub/cryptlib_null/kdf/hkdf_sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pem/pem.c b/os_stub/cryptlib_null/pem/pem.c
index 9d48975566d..8c1a6e766df 100644
--- a/os_stub/cryptlib_null/pem/pem.c
+++ b/os_stub/cryptlib_null/pem/pem.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pk/dh.c b/os_stub/cryptlib_null/pk/dh.c
index 544b20185f6..8b81bc82273 100644
--- a/os_stub/cryptlib_null/pk/dh.c
+++ b/os_stub/cryptlib_null/pk/dh.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pk/ec.c b/os_stub/cryptlib_null/pk/ec.c
index 6a6dcb087f3..058ca48b8c7 100644
--- a/os_stub/cryptlib_null/pk/ec.c
+++ b/os_stub/cryptlib_null/pk/ec.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pk/ecd.c b/os_stub/cryptlib_null/pk/ecd.c
index 8df324f6921..61cbe593149 100644
--- a/os_stub/cryptlib_null/pk/ecd.c
+++ b/os_stub/cryptlib_null/pk/ecd.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pk/rsa_basic.c b/os_stub/cryptlib_null/pk/rsa_basic.c
index 2e8f6f1afd9..10cbc581e16 100644
--- a/os_stub/cryptlib_null/pk/rsa_basic.c
+++ b/os_stub/cryptlib_null/pk/rsa_basic.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pk/rsa_ext.c b/os_stub/cryptlib_null/pk/rsa_ext.c
index 84f43c585c6..6e7a70c0b79 100644
--- a/os_stub/cryptlib_null/pk/rsa_ext.c
+++ b/os_stub/cryptlib_null/pk/rsa_ext.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pk/sm2.c b/os_stub/cryptlib_null/pk/sm2.c
index 7148dbe6c6e..894ca47d48d 100644
--- a/os_stub/cryptlib_null/pk/sm2.c
+++ b/os_stub/cryptlib_null/pk/sm2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/pk/x509.c b/os_stub/cryptlib_null/pk/x509.c
index 6ecfef56585..f60e0f4caed 100644
--- a/os_stub/cryptlib_null/pk/x509.c
+++ b/os_stub/cryptlib_null/pk/x509.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_null/rand/rand.c b/os_stub/cryptlib_null/rand/rand.c
index aa907469f7a..2d5c5f6c6ed 100644
--- a/os_stub/cryptlib_null/rand/rand.c
+++ b/os_stub/cryptlib_null/rand/rand.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/cipher/aead_aes_gcm.c b/os_stub/cryptlib_openssl/cipher/aead_aes_gcm.c
index aa3000e2c5b..b600bc0e14a 100644
--- a/os_stub/cryptlib_openssl/cipher/aead_aes_gcm.c
+++ b/os_stub/cryptlib_openssl/cipher/aead_aes_gcm.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/cipher/aead_chacha20_poly1305.c b/os_stub/cryptlib_openssl/cipher/aead_chacha20_poly1305.c
index b4451e05362..221ebdcca74 100644
--- a/os_stub/cryptlib_openssl/cipher/aead_chacha20_poly1305.c
+++ b/os_stub/cryptlib_openssl/cipher/aead_chacha20_poly1305.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/cipher/aead_sm4_gcm.c b/os_stub/cryptlib_openssl/cipher/aead_sm4_gcm.c
index 81669d68dfd..54d3a504466 100644
--- a/os_stub/cryptlib_openssl/cipher/aead_sm4_gcm.c
+++ b/os_stub/cryptlib_openssl/cipher/aead_sm4_gcm.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/der/der.c b/os_stub/cryptlib_openssl/der/der.c
index 4c0efbe5206..651f2eca960 100644
--- a/os_stub/cryptlib_openssl/der/der.c
+++ b/os_stub/cryptlib_openssl/der/der.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/hash/sha.c b/os_stub/cryptlib_openssl/hash/sha.c
index 04011396130..c8ec166a407 100644
--- a/os_stub/cryptlib_openssl/hash/sha.c
+++ b/os_stub/cryptlib_openssl/hash/sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/hash/sha3.c b/os_stub/cryptlib_openssl/hash/sha3.c
index 1ae9a013d5f..1ba20051c60 100644
--- a/os_stub/cryptlib_openssl/hash/sha3.c
+++ b/os_stub/cryptlib_openssl/hash/sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/hash/sm3.c b/os_stub/cryptlib_openssl/hash/sm3.c
index f7739bf0593..b000af6ea27 100644
--- a/os_stub/cryptlib_openssl/hash/sm3.c
+++ b/os_stub/cryptlib_openssl/hash/sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/hmac/hmac_sha.c b/os_stub/cryptlib_openssl/hmac/hmac_sha.c
index 12d5d6c29ea..0ecfc0f6d2d 100644
--- a/os_stub/cryptlib_openssl/hmac/hmac_sha.c
+++ b/os_stub/cryptlib_openssl/hmac/hmac_sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/hmac/hmac_sha3.c b/os_stub/cryptlib_openssl/hmac/hmac_sha3.c
index ed2fdda35e7..f75ba67c65e 100644
--- a/os_stub/cryptlib_openssl/hmac/hmac_sha3.c
+++ b/os_stub/cryptlib_openssl/hmac/hmac_sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/hmac/hmac_sm3.c b/os_stub/cryptlib_openssl/hmac/hmac_sm3.c
index 5e5896ce88a..929e3a98b04 100644
--- a/os_stub/cryptlib_openssl/hmac/hmac_sm3.c
+++ b/os_stub/cryptlib_openssl/hmac/hmac_sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/internal_crypt_lib.h b/os_stub/cryptlib_openssl/internal_crypt_lib.h
index d7a4fdf3cb6..8ac34616b59 100644
--- a/os_stub/cryptlib_openssl/internal_crypt_lib.h
+++ b/os_stub/cryptlib_openssl/internal_crypt_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/kdf/hkdf_sha.c b/os_stub/cryptlib_openssl/kdf/hkdf_sha.c
index 732c807f937..9ba43b40871 100644
--- a/os_stub/cryptlib_openssl/kdf/hkdf_sha.c
+++ b/os_stub/cryptlib_openssl/kdf/hkdf_sha.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/kdf/hkdf_sha3.c b/os_stub/cryptlib_openssl/kdf/hkdf_sha3.c
index 12dbd90f5e7..9fdfe407985 100644
--- a/os_stub/cryptlib_openssl/kdf/hkdf_sha3.c
+++ b/os_stub/cryptlib_openssl/kdf/hkdf_sha3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/kdf/hkdf_sm3.c b/os_stub/cryptlib_openssl/kdf/hkdf_sm3.c
index 7d306af3529..1b8caa182d1 100644
--- a/os_stub/cryptlib_openssl/kdf/hkdf_sm3.c
+++ b/os_stub/cryptlib_openssl/kdf/hkdf_sm3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pem/pem.c b/os_stub/cryptlib_openssl/pem/pem.c
index 0f9a28ea402..6faddc0fef3 100644
--- a/os_stub/cryptlib_openssl/pem/pem.c
+++ b/os_stub/cryptlib_openssl/pem/pem.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pk/dh.c b/os_stub/cryptlib_openssl/pk/dh.c
index aab55679c1f..02c0cd4fa0d 100644
--- a/os_stub/cryptlib_openssl/pk/dh.c
+++ b/os_stub/cryptlib_openssl/pk/dh.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pk/ec.c b/os_stub/cryptlib_openssl/pk/ec.c
index 09df0b9a255..61fa9e57834 100644
--- a/os_stub/cryptlib_openssl/pk/ec.c
+++ b/os_stub/cryptlib_openssl/pk/ec.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pk/ecd.c b/os_stub/cryptlib_openssl/pk/ecd.c
index 23dbd0390b0..818b799d543 100644
--- a/os_stub/cryptlib_openssl/pk/ecd.c
+++ b/os_stub/cryptlib_openssl/pk/ecd.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pk/rsa_basic.c b/os_stub/cryptlib_openssl/pk/rsa_basic.c
index 7969ba6bdd4..1420dfaeb9d 100644
--- a/os_stub/cryptlib_openssl/pk/rsa_basic.c
+++ b/os_stub/cryptlib_openssl/pk/rsa_basic.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pk/rsa_ext.c b/os_stub/cryptlib_openssl/pk/rsa_ext.c
index ae3c8d8a67a..58cce97b071 100644
--- a/os_stub/cryptlib_openssl/pk/rsa_ext.c
+++ b/os_stub/cryptlib_openssl/pk/rsa_ext.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pk/sm2.c b/os_stub/cryptlib_openssl/pk/sm2.c
index a4d8f1c71a6..f0acfd9064a 100644
--- a/os_stub/cryptlib_openssl/pk/sm2.c
+++ b/os_stub/cryptlib_openssl/pk/sm2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/pk/x509.c b/os_stub/cryptlib_openssl/pk/x509.c
index ba21a38e246..33c5eddcac8 100644
--- a/os_stub/cryptlib_openssl/pk/x509.c
+++ b/os_stub/cryptlib_openssl/pk/x509.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/rand/rand.c b/os_stub/cryptlib_openssl/rand/rand.c
index fea47fc7ea4..69a0f329dfd 100644
--- a/os_stub/cryptlib_openssl/rand/rand.c
+++ b/os_stub/cryptlib_openssl/rand/rand.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/cryptlib_openssl/sys_call/crt_wrapper_host.c b/os_stub/cryptlib_openssl/sys_call/crt_wrapper_host.c
index 088022ab0b0..2754cba8ab2 100644
--- a/os_stub/cryptlib_openssl/sys_call/crt_wrapper_host.c
+++ b/os_stub/cryptlib_openssl/sys_call/crt_wrapper_host.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/debuglib/debuglib.c b/os_stub/debuglib/debuglib.c
index 2e64365acca..605ce685adb 100644
--- a/os_stub/debuglib/debuglib.c
+++ b/os_stub/debuglib/debuglib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/debuglib_null/debuglib.c b/os_stub/debuglib_null/debuglib.c
index 7d4209fc67d..504a67608b7 100644
--- a/os_stub/debuglib_null/debuglib.c
+++ b/os_stub/debuglib_null/debuglib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/include/industry_standard/link_type_ex.h b/os_stub/include/industry_standard/link_type_ex.h
index 58caafd4fcc..06b13764e65 100644
--- a/os_stub/include/industry_standard/link_type_ex.h
+++ b/os_stub/include/industry_standard/link_type_ex.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/include/industry_standard/pcap.h b/os_stub/include/industry_standard/pcap.h
index 25df1e49266..dadd6c28b07 100644
--- a/os_stub/include/industry_standard/pcap.h
+++ b/os_stub/include/industry_standard/pcap.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/include/library/malloclib.h b/os_stub/include/library/malloclib.h
index 851e64b50ae..b8ab9990563 100644
--- a/os_stub/include/library/malloclib.h
+++ b/os_stub/include/library/malloclib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/include/library/rnglib.h b/os_stub/include/library/rnglib.h
index b538cd00c6e..e42978b7505 100644
--- a/os_stub/include/library/rnglib.h
+++ b/os_stub/include/library/rnglib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/malloclib/malloclib.c b/os_stub/malloclib/malloclib.c
index 1aa5d449413..2de5c2f8ffd 100644
--- a/os_stub/malloclib/malloclib.c
+++ b/os_stub/malloclib/malloclib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/memlib/compare_mem.c b/os_stub/memlib/compare_mem.c
index b670784f356..fe68b20703a 100644
--- a/os_stub/memlib/compare_mem.c
+++ b/os_stub/memlib/compare_mem.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "base.h"
diff --git a/os_stub/memlib/copy_mem.c b/os_stub/memlib/copy_mem.c
index dfd1f9cef8f..66f18767f7c 100644
--- a/os_stub/memlib/copy_mem.c
+++ b/os_stub/memlib/copy_mem.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/debuglib.h"
diff --git a/os_stub/memlib/set_mem.c b/os_stub/memlib/set_mem.c
index f2d0fbc48ad..720d694fd75 100644
--- a/os_stub/memlib/set_mem.c
+++ b/os_stub/memlib/set_mem.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/library/memlib.h"
diff --git a/os_stub/memlib/zero_mem.c b/os_stub/memlib/zero_mem.c
index 1409572ed67..82734b0c0ee 100644
--- a/os_stub/memlib/zero_mem.c
+++ b/os_stub/memlib/zero_mem.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/library/memlib.h"
diff --git a/os_stub/openssllib/buildinf.h b/os_stub/openssllib/buildinf.h
index 2ad4baf220c..b62a98115fa 100644
--- a/os_stub/openssllib/buildinf.h
+++ b/os_stub/openssllib/buildinf.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #define PLATFORM "LIBSPDM"
diff --git a/os_stub/openssllib/include/arpa/inet.h b/os_stub/openssllib/include/arpa/inet.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/arpa/inet.h
+++ b/os_stub/openssllib/include/arpa/inet.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/arpa/nameser.h b/os_stub/openssllib/include/arpa/nameser.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/arpa/nameser.h
+++ b/os_stub/openssllib/include/arpa/nameser.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/assert.h b/os_stub/openssllib/include/assert.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/assert.h
+++ b/os_stub/openssllib/include/assert.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/crt_support.h b/os_stub/openssllib/include/crt_support.h
index 6b2ec92c4ad..e1a48e3bcda 100644
--- a/os_stub/openssllib/include/crt_support.h
+++ b/os_stub/openssllib/include/crt_support.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/openssllib/include/ctype.h b/os_stub/openssllib/include/ctype.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/ctype.h
+++ b/os_stub/openssllib/include/ctype.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/limits.h b/os_stub/openssllib/include/limits.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/limits.h
+++ b/os_stub/openssllib/include/limits.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/memory.h b/os_stub/openssllib/include/memory.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/memory.h
+++ b/os_stub/openssllib/include/memory.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/netinet/in.h b/os_stub/openssllib/include/netinet/in.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/netinet/in.h
+++ b/os_stub/openssllib/include/netinet/in.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/openssl/configuration.h b/os_stub/openssllib/include/openssl/configuration.h
index 454854fb075..0ea252582e9 100644
--- a/os_stub/openssllib/include/openssl/configuration.h
+++ b/os_stub/openssllib/include/openssl/configuration.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef OPENSSL_CONFIGURATION_H
diff --git a/os_stub/openssllib/include/stdarg.h b/os_stub/openssllib/include/stdarg.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/stdarg.h
+++ b/os_stub/openssllib/include/stdarg.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/stdatomic.h b/os_stub/openssllib/include/stdatomic.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/stdatomic.h
+++ b/os_stub/openssllib/include/stdatomic.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/stdio.h b/os_stub/openssllib/include/stdio.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/stdio.h
+++ b/os_stub/openssllib/include/stdio.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/stdlib.h b/os_stub/openssllib/include/stdlib.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/stdlib.h
+++ b/os_stub/openssllib/include/stdlib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/string.h b/os_stub/openssllib/include/string.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/string.h
+++ b/os_stub/openssllib/include/string.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/strings.h b/os_stub/openssllib/include/strings.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/strings.h
+++ b/os_stub/openssllib/include/strings.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/sys/param.h b/os_stub/openssllib/include/sys/param.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/sys/param.h
+++ b/os_stub/openssllib/include/sys/param.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/sys/shm.h b/os_stub/openssllib/include/sys/shm.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/sys/shm.h
+++ b/os_stub/openssllib/include/sys/shm.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/sys/socket.h b/os_stub/openssllib/include/sys/socket.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/sys/socket.h
+++ b/os_stub/openssllib/include/sys/socket.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/sys/syscall.h b/os_stub/openssllib/include/sys/syscall.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/sys/syscall.h
+++ b/os_stub/openssllib/include/sys/syscall.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/sys/time.h b/os_stub/openssllib/include/sys/time.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/sys/time.h
+++ b/os_stub/openssllib/include/sys/time.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/sys/types.h b/os_stub/openssllib/include/sys/types.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/sys/types.h
+++ b/os_stub/openssllib/include/sys/types.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/sys/utsname.h b/os_stub/openssllib/include/sys/utsname.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/sys/utsname.h
+++ b/os_stub/openssllib/include/sys/utsname.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/syslog.h b/os_stub/openssllib/include/syslog.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/syslog.h
+++ b/os_stub/openssllib/include/syslog.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/time.h b/os_stub/openssllib/include/time.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/time.h
+++ b/os_stub/openssllib/include/time.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/include/unistd.h b/os_stub/openssllib/include/unistd.h
index d61506bb189..1337aa2fad6 100644
--- a/os_stub/openssllib/include/unistd.h
+++ b/os_stub/openssllib/include/unistd.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crt_support.h"
diff --git a/os_stub/openssllib/ossl_store.c b/os_stub/openssllib/ossl_store.c
index 3667d7cee8b..24ceed98875 100644
--- a/os_stub/openssllib/ossl_store.c
+++ b/os_stub/openssllib/ossl_store.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <openssl/store.h>       /* The OSSL_STORE_INFO type numbers */
@@ -153,4 +152,3 @@ OSSL_STORE_SEARCH_free (
   )
 {
 }
-
diff --git a/os_stub/openssllib/rand_pool.c b/os_stub/openssllib/rand_pool.c
index 5bd8120c187..ec81f3031bb 100644
--- a/os_stub/openssllib/rand_pool.c
+++ b/os_stub/openssllib/rand_pool.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "crypto/rand.h"
@@ -141,4 +140,3 @@ ossl_rand_pool_keep_random_devices_open (
   )
 {
 }
-
diff --git a/os_stub/platform_lib/time_linux.c b/os_stub/platform_lib/time_linux.c
index d5e1c357de1..093cb8ce7b4 100644
--- a/os_stub/platform_lib/time_linux.c
+++ b/os_stub/platform_lib/time_linux.c
@@ -1,7 +1,6 @@
 /**
- * Copyright Notice:
- * Copyright 2022 DMTF. All rights reserved.
- * License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/platform_lib/time_sample.c b/os_stub/platform_lib/time_sample.c
index b8eb4dd9af1..873734389a9 100644
--- a/os_stub/platform_lib/time_sample.c
+++ b/os_stub/platform_lib/time_sample.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /*
diff --git a/os_stub/platform_lib/time_win.c b/os_stub/platform_lib/time_win.c
index a83c7a2214c..2e75f82fe06 100644
--- a/os_stub/platform_lib/time_win.c
+++ b/os_stub/platform_lib/time_win.c
@@ -1,7 +1,6 @@
 /**
- * Copyright Notice:
- * Copyright 2022 DMTF. All rights reserved.
- * License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/platform_lib/watchdog.c b/os_stub/platform_lib/watchdog.c
index a533135006b..7f62e6d1676 100644
--- a/os_stub/platform_lib/watchdog.c
+++ b/os_stub/platform_lib/watchdog.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "base.h"
diff --git a/os_stub/platform_lib_null/time_linux.c b/os_stub/platform_lib_null/time_linux.c
index bce3c9f6f36..75a339f3e65 100644
--- a/os_stub/platform_lib_null/time_linux.c
+++ b/os_stub/platform_lib_null/time_linux.c
@@ -1,7 +1,6 @@
 /**
- * Copyright Notice:
- * Copyright 2022 DMTF. All rights reserved.
- * License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/platform_lib_null/time_win.c b/os_stub/platform_lib_null/time_win.c
index bce3c9f6f36..75a339f3e65 100644
--- a/os_stub/platform_lib_null/time_win.c
+++ b/os_stub/platform_lib_null/time_win.c
@@ -1,7 +1,6 @@
 /**
- * Copyright Notice:
- * Copyright 2022 DMTF. All rights reserved.
- * License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/platform_lib_null/watchdog.c b/os_stub/platform_lib_null/watchdog.c
index a533135006b..7f62e6d1676 100644
--- a/os_stub/platform_lib_null/watchdog.c
+++ b/os_stub/platform_lib_null/watchdog.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2022-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "base.h"
diff --git a/os_stub/rnglib/rng_arm_sample.c b/os_stub/rnglib/rng_arm_sample.c
index 69cc89f44a1..d939bedb61a 100644
--- a/os_stub/rnglib/rng_arm_sample.c
+++ b/os_stub/rnglib/rng_arm_sample.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/rnglib/rng_linux.c b/os_stub/rnglib/rng_linux.c
index 4ea927c6cee..1acc2e727d0 100644
--- a/os_stub/rnglib/rng_linux.c
+++ b/os_stub/rnglib/rng_linux.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/rnglib/rng_std.c b/os_stub/rnglib/rng_std.c
index 2a6ab70910d..296db0f9caf 100644
--- a/os_stub/rnglib/rng_std.c
+++ b/os_stub/rnglib/rng_std.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/rnglib/rng_win.c b/os_stub/rnglib/rng_win.c
index 1d1dda05957..60132d5e366 100644
--- a/os_stub/rnglib/rng_win.c
+++ b/os_stub/rnglib/rng_win.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback.c b/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback.c
index 0f66fdc51c0..fc1e9fbabd6 100644
--- a/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback.c
+++ b/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback_internal.h b/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback_internal.h
index 633679a664d..1382bc3b120 100644
--- a/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback_internal.h
+++ b/os_stub/spdm_cert_verify_callback_sample/spdm_cert_verify_callback_internal.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_CERT_VERIFY_CALLBACK_INTERNAL_H
diff --git a/os_stub/spdm_crypt_ext_lib/cryptlib_ext.h b/os_stub/spdm_crypt_ext_lib/cryptlib_ext.h
index d709625e1f9..22807c8bbc3 100644
--- a/os_stub/spdm_crypt_ext_lib/cryptlib_ext.h
+++ b/os_stub/spdm_crypt_ext_lib/cryptlib_ext.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef CRYPTLIB_EXT_H
diff --git a/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext.c b/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext.c
index 5b6fdc6f783..10467aab19f 100644
--- a/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext.c
+++ b/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_lib_config.h"
diff --git a/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext_lib.h b/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext_lib.h
index c9f808c2157..b5a018d1de5 100644
--- a/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext_lib.h
+++ b/os_stub/spdm_crypt_ext_lib/spdm_crypt_ext_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef SPDM_CRYPT_EXT_LIB_H
diff --git a/os_stub/spdm_device_secret_lib_null/lib.c b/os_stub/spdm_device_secret_lib_null/lib.c
index fee9e8403f3..e638c66b48b 100644
--- a/os_stub/spdm_device_secret_lib_null/lib.c
+++ b/os_stub/spdm_device_secret_lib_null/lib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/spdm_device_secret_lib_sample/cert.c b/os_stub/spdm_device_secret_lib_sample/cert.c
index c5670aaeed3..9d2e62527ab 100644
--- a/os_stub/spdm_device_secret_lib_sample/cert.c
+++ b/os_stub/spdm_device_secret_lib_sample/cert.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/spdm_device_secret_lib_sample/lib.c b/os_stub/spdm_device_secret_lib_sample/lib.c
index 417b60a6045..e628b05c89f 100644
--- a/os_stub/spdm_device_secret_lib_sample/lib.c
+++ b/os_stub/spdm_device_secret_lib_sample/lib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/os_stub/spdm_device_secret_lib_sample/raw_data_key.h b/os_stub/spdm_device_secret_lib_sample/raw_data_key.h
index 376347185e4..8703e14fa82 100644
--- a/os_stub/spdm_device_secret_lib_sample/raw_data_key.h
+++ b/os_stub/spdm_device_secret_lib_sample/raw_data_key.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /*automatic generated by raw_data_key_gen.py*/
diff --git a/os_stub/spdm_device_secret_lib_sample/spdm_device_secret_lib_internal.h b/os_stub/spdm_device_secret_lib_sample/spdm_device_secret_lib_internal.h
index 961f98e287e..0c5621acca1 100644
--- a/os_stub/spdm_device_secret_lib_sample/spdm_device_secret_lib_internal.h
+++ b/os_stub/spdm_device_secret_lib_sample/spdm_device_secret_lib_internal.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/unit_test/cmockalib/strdup.c b/unit_test/cmockalib/strdup.c
index 327df5a9bf1..eca9aa94ece 100644
--- a/unit_test/cmockalib/strdup.c
+++ b/unit_test/cmockalib/strdup.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <string.h>
diff --git a/unit_test/fuzzing/spdm_unit_fuzzing_common/algo.c b/unit_test/fuzzing/spdm_unit_fuzzing_common/algo.c
index 8918a8ac968..60a23b4ae45 100644
--- a/unit_test/fuzzing/spdm_unit_fuzzing_common/algo.c
+++ b/unit_test/fuzzing/spdm_unit_fuzzing_common/algo.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/spdm_unit_fuzzing_common/common.c b/unit_test/fuzzing/spdm_unit_fuzzing_common/common.c
index 5f99c8ec904..3e224ed93de 100644
--- a/unit_test/fuzzing/spdm_unit_fuzzing_common/common.c
+++ b/unit_test/fuzzing/spdm_unit_fuzzing_common/common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/spdm_unit_fuzzing_common/spdm_unit_fuzzing.h b/unit_test/fuzzing/spdm_unit_fuzzing_common/spdm_unit_fuzzing.h
index 512ed379d98..2df72dbf21f 100644
--- a/unit_test/fuzzing/spdm_unit_fuzzing_common/spdm_unit_fuzzing.h
+++ b/unit_test/fuzzing/spdm_unit_fuzzing_common/spdm_unit_fuzzing.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef __SPDM_UNIT_FUZZING_H__
diff --git a/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.c b/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.c
index 337735cdc96..1e78bf325ef 100644
--- a/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.c
+++ b/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.h b/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.h
index 4752d0e7a15..45f487f0bf8 100644
--- a/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.h
+++ b/unit_test/fuzzing/spdm_unit_fuzzing_common/toolchain_harness.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef _TOOLCHAIN_HARNESS_LIB_
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/challenge.c b/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/challenge.c
index a206ff1605a..72422810fcc 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/challenge.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/challenge.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/chunk_get.c b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/chunk_get.c
index b3bf38a4497..a6dcb9bab49 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/chunk_get.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/chunk_get.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/chunk_send.c b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/chunk_send.c
index 8e64834b432..5a34dedbfc5 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/chunk_send.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/chunk_send.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/encap_certificate.c b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/encap_certificate.c
index a90394f13eb..3f99e91842c 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/encap_certificate.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/encap_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/encap_challenge_auth.c b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/encap_challenge_auth.c
index dea3ceb75b1..71430b318a6 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/encap_challenge_auth.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/encap_challenge_auth.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/encap_digests.c b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/encap_digests.c
index 5cb6f9f7825..fe5476a3e50 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/encap_digests.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/encap_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/encap_key_update.c b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/encap_key_update.c
index a625559e29f..c8ea1834b19 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/encap_key_update.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/encap_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/encap_request.c b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/encap_request.c
index 294a64001b5..81e3f35a9e1 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/encap_request.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/encap_request.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/end_session.c b/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/end_session.c
index bcb24d5362e..2be0d0e0bd7 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/end_session.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/end_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_finish/finish.c b/unit_test/fuzzing/test_requester/test_spdm_requester_finish/finish.c
index 233c3980233..15d80eaab44 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_finish/finish.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_finish/finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/get_capabilities.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/get_capabilities.c
index 5bab433d419..b518cae89d6 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/get_capabilities.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/get_capabilities.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/get_certificate.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/get_certificate.c
index 58ec18fa4db..5a74084203b 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/get_certificate.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/get_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c
index 912e8942814..b477eb07018 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/get_csr.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/get_digests.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/get_digests.c
index 61fee2c023c..f5aeca438ff 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/get_digests.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/get_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/get_event_types.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/get_event_types.c
index 6e70e01b602..1087e264ac9 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/get_event_types.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/get_event_types.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/get_measurement_extension_log.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/get_measurement_extension_log.c
index d3084ecbdef..f2e3bd90536 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/get_measurement_extension_log.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/get_measurement_extension_log.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/get_measurements.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/get_measurements.c
index 8f1b5ae2c42..018cabd57e4 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/get_measurements.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/get_measurements.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/get_version.c b/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/get_version.c
index afc2153bd75..73393069bc8 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/get_version.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/get_version.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/heartbeat.c b/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/heartbeat.c
index 75007c08fb0..d5c37b3dce2 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/heartbeat.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/heartbeat.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c b/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c
index 7672dad570a..f69f51093ba 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/key_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/key_update.c b/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/key_update.c
index 9c09ffe0412..3fe3aa8840e 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/key_update.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/negotiate_algorithms.c b/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/negotiate_algorithms.c
index cb497a28160..64e3137bc12 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/negotiate_algorithms.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/negotiate_algorithms.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c
index e6a5cc257ef..c102ceb916d 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/psk_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/psk_finish.c b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/psk_finish.c
index 5b5e538c0cc..ef924d1f8c0 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/psk_finish.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/psk_finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c b/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c
index 0ac6f1c9501..e03d845ff75 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/set_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/vendor_cmds.c b/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/vendor_cmds.c
index 900cac62d89..3ce49098d58 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/vendor_cmds.c
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/vendor_cmds.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/algorithms.c b/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/algorithms.c
index 1eb5c63ffe3..ea4e4db9075 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/algorithms.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/algorithms.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/capabilities.c b/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/capabilities.c
index 20a1aa5e749..1528b02498b 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/capabilities.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/capabilities.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/certificate.c b/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/certificate.c
index 58a8ac67b02..073a1551fe9 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/certificate.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/challenge_auth.c b/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/challenge_auth.c
index 06bf1b9be84..01eea517cbe 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/challenge_auth.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/challenge_auth.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/chunk_get.c b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/chunk_get.c
index 7d7f1c1881b..ef3487545b6 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/chunk_get.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/chunk_get.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/chunk_send_ack.c b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/chunk_send_ack.c
index 7612fcd16c0..91410763b5f 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/chunk_send_ack.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/chunk_send_ack.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_csr/csr.c b/unit_test/fuzzing/test_responder/test_spdm_responder_csr/csr.c
index e602eb4af38..87915f3c255 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_csr/csr.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_csr/csr.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_digests/digests.c b/unit_test/fuzzing/test_responder/test_spdm_responder_digests/digests.c
index ad8510738a4..bb9f8fc879a 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_digests/digests.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_digests/digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/encap_challenge.c b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/encap_challenge.c
index fb5f8cc9155..bbd45ec7a8f 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/encap_challenge.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/encap_challenge.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/encap_get_certificate.c b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/encap_get_certificate.c
index 8dcbdfc3fba..3a6b222cdca 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/encap_get_certificate.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/encap_get_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/encap_get_digests.c b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/encap_get_digests.c
index 0845a2c396f..a73327ecb49 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/encap_get_digests.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/encap_get_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/encap_key_update.c b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/encap_key_update.c
index 9b2b3a98b11..3ae66fdbd82 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/encap_key_update.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/encap_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/encap_response.c b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/encap_response.c
index e747749ec03..44f54b003d9 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/encap_response.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/encap_response.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/end_session.c b/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/end_session.c
index 2b2c7586ba8..277aba51ef4 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/end_session.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/end_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/finish_rsp.c b/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/finish_rsp.c
index ce34955270e..01d7a6d61bd 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/finish_rsp.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/finish_rsp.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/heartbeat_ack.c b/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/heartbeat_ack.c
index a3f289a8470..5e569236759 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/heartbeat_ack.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/heartbeat_ack.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/respond_if_ready.c b/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/respond_if_ready.c
index 416747d78a0..10dc1aa3b92 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/respond_if_ready.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/respond_if_ready.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/key_exchange.c b/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/key_exchange.c
index 7e8c00c6833..74e856c0af4 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/key_exchange.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/key_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/key_update.c b/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/key_update.c
index 341972d86d3..93a7e501944 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/key_update.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/measurement_extension_log.c b/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/measurement_extension_log.c
index f8e41295549..dba34556b5b 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/measurement_extension_log.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/measurement_extension_log.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/measurements.c b/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/measurements.c
index 3251aa5e098..474443b9039 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/measurements.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/measurements.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/psk_exchange_rsp.c b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/psk_exchange_rsp.c
index 3de50cc3755..bd12e1bf0e6 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/psk_exchange_rsp.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/psk_exchange_rsp.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/psk_finish_rsp.c b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/psk_finish_rsp.c
index 8871be5959c..732c200368a 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/psk_finish_rsp.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/psk_finish_rsp.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/set_certificate_rsp.c b/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/set_certificate_rsp.c
index 854677bf4a5..380e380abba 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/set_certificate_rsp.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/set_certificate_rsp.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/event_types.c b/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/event_types.c
index a21d80ef155..9368cfee6fd 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/event_types.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/event_types.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/vendor_cmds.c b/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/vendor_cmds.c
index 3b6331a49bf..21390a4b633 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/vendor_cmds.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/vendor_cmds.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_version/version.c b/unit_test/fuzzing/test_responder/test_spdm_responder_version/version.c
index cf800322743..81456832e45 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_version/version.c
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_version/version.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_fuzzing.h"
diff --git a/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/spdm_decode_secured_message.c b/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/spdm_decode_secured_message.c
index 0175da09ee1..02fdf9c1741 100644
--- a/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/spdm_decode_secured_message.c
+++ b/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/spdm_decode_secured_message.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/spdm_encode_secured_message.c b/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/spdm_encode_secured_message.c
index 0d9d416c439..01dd9e03ec9 100644
--- a/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/spdm_encode_secured_message.c
+++ b/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/spdm_encode_secured_message.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/test_process_opaque_data_supported_version_data.c b/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/test_process_opaque_data_supported_version_data.c
index eccdc191879..112412931b9 100644
--- a/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/test_process_opaque_data_supported_version_data.c
+++ b/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/test_process_opaque_data_supported_version_data.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_crypt_lib.h"
diff --git a/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/x509_certificate_check.c b/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/x509_certificate_check.c
index 8fe979d388b..1148ec772c1 100644
--- a/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/x509_certificate_check.c
+++ b/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/x509_certificate_check.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_crypt_lib.h"
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/spdm_transport_mctp_decode_message.c b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/spdm_transport_mctp_decode_message.c
index 58e36826c24..68b78810bbd 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/spdm_transport_mctp_decode_message.c
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/spdm_transport_mctp_decode_message.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/transport_mctp_encode_message.c b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/transport_mctp_encode_message.c
index 1af6e2293eb..abc2bb3004d 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/transport_mctp_encode_message.c
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/transport_mctp_encode_message.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/spdm_transport_pci_doe_decode_message.c b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/spdm_transport_pci_doe_decode_message.c
index f18ab75f969..0faf5936eaa 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/spdm_transport_pci_doe_decode_message.c
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/spdm_transport_pci_doe_decode_message.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/spdm_transport_pci_doe_encode_message.c b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/spdm_transport_pci_doe_encode_message.c
index 1ccb0d5eaaa..a347bf93148 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/spdm_transport_pci_doe_encode_message.c
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/spdm_transport_pci_doe_encode_message.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/fuzzing/tool/transfer_ktest_to_seed.py b/unit_test/fuzzing/tool/transfer_ktest_to_seed.py
index ebc29d03236..f2794ed34ae 100644
--- a/unit_test/fuzzing/tool/transfer_ktest_to_seed.py
+++ b/unit_test/fuzzing/tool/transfer_ktest_to_seed.py
@@ -1,6 +1,6 @@
-#   Copyright Notice:
-#   Copyright 2021-2022 DMTF. All rights reserved.
-#   License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
 
 import os
 import struct
@@ -95,4 +95,4 @@ def print_usage():
             for object in object_list:
                 NewFileName = gen_new_name(file, object[0], object[1])
                 gen_seed(NewFileName, object[2])
-                print('generate %s done.' % NewFileName)
\ No newline at end of file
+                print('generate %s done.' % NewFileName)
diff --git a/unit_test/include/library/spdm_transport_test_lib.h b/unit_test/include/library/spdm_transport_test_lib.h
index 5667c54811b..29451ba729f 100644
--- a/unit_test/include/library/spdm_transport_test_lib.h
+++ b/unit_test/include/library/spdm_transport_test_lib.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef __SPDM_TEST_TRANSPORT_LIB_H__
diff --git a/unit_test/spdm_transport_test_lib/common.c b/unit_test/spdm_transport_test_lib/common.c
index b7e7f3013d9..50159cdf739 100644
--- a/unit_test/spdm_transport_test_lib/common.c
+++ b/unit_test/spdm_transport_test_lib/common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_transport_test_lib.h"
diff --git a/unit_test/spdm_transport_test_lib/test.c b/unit_test/spdm_transport_test_lib/test.c
index 907ad80f2b1..2e0af086ef3 100644
--- a/unit_test/spdm_transport_test_lib/test.c
+++ b/unit_test/spdm_transport_test_lib/test.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "library/spdm_transport_test_lib.h"
diff --git a/unit_test/spdm_unit_test_common/algo.c b/unit_test/spdm_unit_test_common/algo.c
index 9ba35592879..f9e38e56053 100644
--- a/unit_test/spdm_unit_test_common/algo.c
+++ b/unit_test/spdm_unit_test_common/algo.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/spdm_unit_test_common/common.c b/unit_test/spdm_unit_test_common/common.c
index 447628f3515..65f43f67ffd 100644
--- a/unit_test/spdm_unit_test_common/common.c
+++ b/unit_test/spdm_unit_test_common/common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/spdm_unit_test_common/spdm_unit_test.h b/unit_test/spdm_unit_test_common/spdm_unit_test.h
index 2e3eb5c7738..629db3c6597 100644
--- a/unit_test/spdm_unit_test_common/spdm_unit_test.h
+++ b/unit_test/spdm_unit_test_common/spdm_unit_test.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef __SPDM_UNIT_TEST_H__
diff --git a/unit_test/spdm_unit_test_common/support.c b/unit_test/spdm_unit_test_common/support.c
index 8ababd147dc..3c3d753ee5f 100644
--- a/unit_test/spdm_unit_test_common/support.c
+++ b/unit_test/spdm_unit_test_common/support.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_crypt/aead_verify.c b/unit_test/test_crypt/aead_verify.c
index 15051528583..f83d196bc8b 100644
--- a/unit_test/test_crypt/aead_verify.c
+++ b/unit_test/test_crypt/aead_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/dh_verify.c b/unit_test/test_crypt/dh_verify.c
index 92efde2fe3a..fd1dd2f71f2 100644
--- a/unit_test/test_crypt/dh_verify.c
+++ b/unit_test/test_crypt/dh_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/ec_verify.c b/unit_test/test_crypt/ec_verify.c
index 4ec825a6133..53911d4db5a 100644
--- a/unit_test/test_crypt/ec_verify.c
+++ b/unit_test/test_crypt/ec_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/ec_verify2.c b/unit_test/test_crypt/ec_verify2.c
index d7f0823b08d..51155ec736e 100644
--- a/unit_test/test_crypt/ec_verify2.c
+++ b/unit_test/test_crypt/ec_verify2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/ecd_verify.c b/unit_test/test_crypt/ecd_verify.c
index dc4f4c976d0..ca7766e6822 100644
--- a/unit_test/test_crypt/ecd_verify.c
+++ b/unit_test/test_crypt/ecd_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/ecd_verify2.c b/unit_test/test_crypt/ecd_verify2.c
index 1906a384b7d..63f249252cc 100644
--- a/unit_test/test_crypt/ecd_verify2.c
+++ b/unit_test/test_crypt/ecd_verify2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/hash_verify.c b/unit_test/test_crypt/hash_verify.c
index cf6edabdf19..84e09617a6c 100644
--- a/unit_test/test_crypt/hash_verify.c
+++ b/unit_test/test_crypt/hash_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/hkdf_verify.c b/unit_test/test_crypt/hkdf_verify.c
index 229f2322af5..657aaa3ef0a 100644
--- a/unit_test/test_crypt/hkdf_verify.c
+++ b/unit_test/test_crypt/hkdf_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/hmac_verify.c b/unit_test/test_crypt/hmac_verify.c
index b26f59db45b..7e1e573334a 100644
--- a/unit_test/test_crypt/hmac_verify.c
+++ b/unit_test/test_crypt/hmac_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/os_support.c b/unit_test/test_crypt/os_support.c
index 16541011ef9..759c54663a7 100644
--- a/unit_test/test_crypt/os_support.c
+++ b/unit_test/test_crypt/os_support.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/rand_verify.c b/unit_test/test_crypt/rand_verify.c
index 5136986f93c..c2acc4c001d 100644
--- a/unit_test/test_crypt/rand_verify.c
+++ b/unit_test/test_crypt/rand_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/rsa_verify.c b/unit_test/test_crypt/rsa_verify.c
index 82f512c1311..210e1af0d8e 100644
--- a/unit_test/test_crypt/rsa_verify.c
+++ b/unit_test/test_crypt/rsa_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/rsa_verify2.c b/unit_test/test_crypt/rsa_verify2.c
index f0654c1b179..bdb8b8463b9 100644
--- a/unit_test/test_crypt/rsa_verify2.c
+++ b/unit_test/test_crypt/rsa_verify2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/sm2_verify.c b/unit_test/test_crypt/sm2_verify.c
index f3f81700f7e..069e3a848b4 100644
--- a/unit_test/test_crypt/sm2_verify.c
+++ b/unit_test/test_crypt/sm2_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/sm2_verify2.c b/unit_test/test_crypt/sm2_verify2.c
index 63b1074db37..28565244776 100644
--- a/unit_test/test_crypt/sm2_verify2.c
+++ b/unit_test/test_crypt/sm2_verify2.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/test_crypt.c b/unit_test/test_crypt/test_crypt.c
index 7dbd893a3e7..7e0f36ddb00 100644
--- a/unit_test/test_crypt/test_crypt.c
+++ b/unit_test/test_crypt/test_crypt.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "test_crypt.h"
diff --git a/unit_test/test_crypt/test_crypt.h b/unit_test/test_crypt/test_crypt.h
index 84125841821..5073779384a 100644
--- a/unit_test/test_crypt/test_crypt.h
+++ b/unit_test/test_crypt/test_crypt.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef __CRYPTEST_H__
diff --git a/unit_test/test_crypt/x509_verify.c b/unit_test/test_crypt/x509_verify.c
index be6a73427e5..e360d9ef7d6 100644
--- a/unit_test/test_crypt/x509_verify.c
+++ b/unit_test/test_crypt/x509_verify.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 #include "test_crypt.h"
 #include "industry_standard/spdm.h"
diff --git a/unit_test/test_size/cryptstublib_dummy/rand_dummy.c b/unit_test/test_size/cryptstublib_dummy/rand_dummy.c
index 3bcd8e8ead9..fef99258b05 100644
--- a/unit_test/test_size/cryptstublib_dummy/rand_dummy.c
+++ b/unit_test/test_size/cryptstublib_dummy/rand_dummy.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/cryptstublib_dummy/timeclock_dummy.c b/unit_test/test_size/cryptstublib_dummy/timeclock_dummy.c
index 1f290685bb6..f97b3ebb297 100644
--- a/unit_test/test_size/cryptstublib_dummy/timeclock_dummy.c
+++ b/unit_test/test_size/cryptstublib_dummy/timeclock_dummy.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ashldi3.c b/unit_test/test_size/intrinsiclib/ashldi3.c
index 951312ae213..b76a300b853 100644
--- a/unit_test/test_size/intrinsiclib/ashldi3.c
+++ b/unit_test/test_size/intrinsiclib/ashldi3.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /*Portions of this file have been modified from the original (https://github.com/intel/linux-sgx/blob/master/sdk/compiler-rt/ashldi3.c) under the following copyright and license.*/
diff --git a/unit_test/test_size/intrinsiclib/compiler_stub.c b/unit_test/test_size/intrinsiclib/compiler_stub.c
index fd39cc563a8..1fea7aa885c 100644
--- a/unit_test/test_size/intrinsiclib/compiler_stub.c
+++ b/unit_test/test_size/intrinsiclib/compiler_stub.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 void __stack_chk_guard (void)
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64.c b/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64.c
index de406acf92f..b3a78e61fca 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64_remainder.c b/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64_remainder.c
index 0546fba5ad5..8c435285b81 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64_remainder.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_div_s64x64_remainder.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64.c b/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64.c
index e118f78f4f0..bb7f1971675 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64_remainder.c b/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64_remainder.c
index 5c7783a7ab9..ce06cd2ce1e 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64_remainder.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_div_u64x64_remainder.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_ftol.c b/unit_test/test_size/intrinsiclib/ia32/math_ftol.c
index 6db9f314721..f5d64139445 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_ftol.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_ftol.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /*
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_lshift_s64.c b/unit_test/test_size/intrinsiclib/ia32/math_lshift_s64.c
index 0679cb76c01..9eb66c9ad67 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_lshift_s64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_lshift_s64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /*
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_mult_s64x64.c b/unit_test/test_size/intrinsiclib/ia32/math_mult_s64x64.c
index 307527d91c8..92faa7c9648 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_mult_s64x64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_mult_s64x64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_remainder_s64x64.c b/unit_test/test_size/intrinsiclib/ia32/math_remainder_s64x64.c
index 90144e9f786..bb5a1d0cabe 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_remainder_s64x64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_remainder_s64x64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_remainder_u64x64.c b/unit_test/test_size/intrinsiclib/ia32/math_remainder_u64x64.c
index ccb6eedf04a..4a9cecf6f43 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_remainder_u64x64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_remainder_u64x64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_rshift_s64.c b/unit_test/test_size/intrinsiclib/ia32/math_rshift_s64.c
index ab41f463d8a..a3d0654a55d 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_rshift_s64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_rshift_s64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /*
diff --git a/unit_test/test_size/intrinsiclib/ia32/math_rshift_u64.c b/unit_test/test_size/intrinsiclib/ia32/math_rshift_u64.c
index c982082293a..971ec2e3cdb 100644
--- a/unit_test/test_size/intrinsiclib/ia32/math_rshift_u64.c
+++ b/unit_test/test_size/intrinsiclib/ia32/math_rshift_u64.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /*
diff --git a/unit_test/test_size/intrinsiclib/memory_intrinsics.c b/unit_test/test_size/intrinsiclib/memory_intrinsics.c
index 7ed84a2c4e7..cbbc734adce 100644
--- a/unit_test/test_size/intrinsiclib/memory_intrinsics.c
+++ b/unit_test/test_size/intrinsiclib/memory_intrinsics.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 /** @file
diff --git a/unit_test/test_size/malloclib_null/malloclib.c b/unit_test/test_size/malloclib_null/malloclib.c
index 44c487d921a..e221a93e91c 100644
--- a/unit_test/test_size/malloclib_null/malloclib.c
+++ b/unit_test/test_size/malloclib_null/malloclib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/malloclib_simple/malloclib.c b/unit_test/test_size/malloclib_simple/malloclib.c
index ca263a439df..79844d250a3 100644
--- a/unit_test/test_size/malloclib_simple/malloclib.c
+++ b/unit_test/test_size/malloclib_simple/malloclib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "hal/base.h"
diff --git a/unit_test/test_size/rnglib_null/rnglib.c b/unit_test/test_size/rnglib_null/rnglib.c
index f01bc2daf5c..5db6ae40f54 100644
--- a/unit_test/test_size/rnglib_null/rnglib.c
+++ b/unit_test/test_size/rnglib_null/rnglib.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include <base.h>
diff --git a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester.h b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester.h
index 621d2c05ee1..bb0d1953566 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester.h
+++ b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef __SPDM_REQUESTER_H__
diff --git a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_authentication.c b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_authentication.c
index fb45f3472de..937b06c5849 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_authentication.c
+++ b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_authentication.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_requester.h"
diff --git a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c
index 65f80320e96..ff8ec97f8cb 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c
+++ b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_init.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_requester.h"
diff --git a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_main.c b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_main.c
index ea45cbe4d04..693c9e94a67 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_main.c
+++ b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_main.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_requester.h"
diff --git a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c
index 0b17f26046a..cb292bcf519 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c
+++ b/unit_test/test_size/test_size_of_spdm_requester/spdm_requester_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_requester.h"
diff --git a/unit_test/test_size/test_size_of_spdm_requester/support.c b/unit_test/test_size/test_size_of_spdm_requester/support.c
index eb05778f347..affe3072984 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/support.c
+++ b/unit_test/test_size/test_size_of_spdm_requester/support.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_requester.h"
diff --git a/unit_test/test_size/test_size_of_spdm_responder/spdm_responder.h b/unit_test/test_size/test_size_of_spdm_responder/spdm_responder.h
index caef5bd41df..9b15db5e1f5 100644
--- a/unit_test/test_size/test_size_of_spdm_responder/spdm_responder.h
+++ b/unit_test/test_size/test_size_of_spdm_responder/spdm_responder.h
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #ifndef __SPDM_RESPONDER_H__
diff --git a/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_init.c b/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_init.c
index 1f9661efb5e..95a69c68b6a 100644
--- a/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_init.c
+++ b/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_init.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_responder.h"
diff --git a/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_main.c b/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_main.c
index 54221464d5e..f4a94f66946 100644
--- a/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_main.c
+++ b/unit_test/test_size/test_size_of_spdm_responder/spdm_responder_main.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_responder.h"
diff --git a/unit_test/test_size/test_size_of_spdm_responder/support.c b/unit_test/test_size/test_size_of_spdm_responder/support.c
index d6d966d31c5..f0c2c26cb47 100644
--- a/unit_test/test_size/test_size_of_spdm_responder/support.c
+++ b/unit_test/test_size/test_size_of_spdm_responder/support.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_responder.h"
diff --git a/unit_test/test_spdm_common/context_data.c b/unit_test/test_spdm_common/context_data.c
index a09873625c2..1022bfa6881 100644
--- a/unit_test/test_spdm_common/context_data.c
+++ b/unit_test/test_spdm_common/context_data.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_common/support.c b/unit_test/test_spdm_common/support.c
index 3ffe0a16e72..a8d5a882326 100644
--- a/unit_test/test_spdm_common/support.c
+++ b/unit_test/test_spdm_common/support.c
@@ -1,3 +1,8 @@
+/**
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
+ **/
+
 #include "spdm_unit_test.h"
 #include "internal/libspdm_common_lib.h"
 
diff --git a/unit_test/test_spdm_common/test_spdm_common.c b/unit_test/test_spdm_common/test_spdm_common.c
index 2b83c27d744..7b732d9167d 100644
--- a/unit_test/test_spdm_common/test_spdm_common.c
+++ b/unit_test/test_spdm_common/test_spdm_common.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 
diff --git a/unit_test/test_spdm_crypt/test_spdm_crypt.c b/unit_test/test_spdm_crypt/test_spdm_crypt.c
index 5f49afe11ea..87d4e7547eb 100644
--- a/unit_test/test_spdm_crypt/test_spdm_crypt.c
+++ b/unit_test/test_spdm_crypt/test_spdm_crypt.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_fips/test_spdm_fips.c b/unit_test/test_spdm_fips/test_spdm_fips.c
index 4f1d092ad1f..c16c6adadb8 100644
--- a/unit_test/test_spdm_fips/test_spdm_fips.c
+++ b/unit_test/test_spdm_fips/test_spdm_fips.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/challenge.c b/unit_test/test_spdm_requester/challenge.c
index 264b4ad6f0e..a015d0094d3 100644
--- a/unit_test/test_spdm_requester/challenge.c
+++ b/unit_test/test_spdm_requester/challenge.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/chunk_get.c b/unit_test/test_spdm_requester/chunk_get.c
index 96c25e015ee..d7a99030c30 100644
--- a/unit_test/test_spdm_requester/chunk_get.c
+++ b/unit_test/test_spdm_requester/chunk_get.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/chunk_send.c b/unit_test/test_spdm_requester/chunk_send.c
index 5c2fee76198..c0f9009f274 100644
--- a/unit_test/test_spdm_requester/chunk_send.c
+++ b/unit_test/test_spdm_requester/chunk_send.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/encap_certificate.c b/unit_test/test_spdm_requester/encap_certificate.c
index 72f9d8549ba..af93e588952 100644
--- a/unit_test/test_spdm_requester/encap_certificate.c
+++ b/unit_test/test_spdm_requester/encap_certificate.c
@@ -1,8 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link:
- * https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/encap_challenge_auth.c b/unit_test/test_spdm_requester/encap_challenge_auth.c
index 46452413fd4..a477ed53544 100644
--- a/unit_test/test_spdm_requester/encap_challenge_auth.c
+++ b/unit_test/test_spdm_requester/encap_challenge_auth.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/encap_digests.c b/unit_test/test_spdm_requester/encap_digests.c
index 6e815e74c0e..e901cfa9011 100644
--- a/unit_test/test_spdm_requester/encap_digests.c
+++ b/unit_test/test_spdm_requester/encap_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 #include "spdm_unit_test.h"
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/test_spdm_requester/encap_key_update.c b/unit_test/test_spdm_requester/encap_key_update.c
index 3d352697638..feb43f89909 100644
--- a/unit_test/test_spdm_requester/encap_key_update.c
+++ b/unit_test/test_spdm_requester/encap_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 #include "spdm_unit_test.h"
 #include "internal/libspdm_requester_lib.h"
diff --git a/unit_test/test_spdm_requester/encap_request.c b/unit_test/test_spdm_requester/encap_request.c
index b4088778469..de5000523d5 100644
--- a/unit_test/test_spdm_requester/encap_request.c
+++ b/unit_test/test_spdm_requester/encap_request.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/end_session.c b/unit_test/test_spdm_requester/end_session.c
index 318514632f9..f55ae4ca8d8 100644
--- a/unit_test/test_spdm_requester/end_session.c
+++ b/unit_test/test_spdm_requester/end_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/get_capabilities_err.c b/unit_test/test_spdm_requester/error_test/get_capabilities_err.c
index d0cb5e60fae..619d2257219 100644
--- a/unit_test/test_spdm_requester/error_test/get_capabilities_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_capabilities_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/get_digests_err.c b/unit_test/test_spdm_requester/error_test/get_digests_err.c
index 6792d1a71b0..40aa41c9f63 100644
--- a/unit_test/test_spdm_requester/error_test/get_digests_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_digests_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/get_event_types_err.c b/unit_test/test_spdm_requester/error_test/get_event_types_err.c
index 0ba35042060..879e58bb0eb 100644
--- a/unit_test/test_spdm_requester/error_test/get_event_types_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_event_types_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/get_measurements_err.c b/unit_test/test_spdm_requester/error_test/get_measurements_err.c
index 027e04fe46a..d2ef5bc5406 100644
--- a/unit_test/test_spdm_requester/error_test/get_measurements_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_measurements_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/get_version_err.c b/unit_test/test_spdm_requester/error_test/get_version_err.c
index 749a8281efc..131628d0713 100644
--- a/unit_test/test_spdm_requester/error_test/get_version_err.c
+++ b/unit_test/test_spdm_requester/error_test/get_version_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/key_exchange_err.c b/unit_test/test_spdm_requester/error_test/key_exchange_err.c
index 07d3b36ee95..7f18454856f 100644
--- a/unit_test/test_spdm_requester/error_test/key_exchange_err.c
+++ b/unit_test/test_spdm_requester/error_test/key_exchange_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/negotiate_algorithms_err.c b/unit_test/test_spdm_requester/error_test/negotiate_algorithms_err.c
index ba465ce0ee7..de663520e45 100644
--- a/unit_test/test_spdm_requester/error_test/negotiate_algorithms_err.c
+++ b/unit_test/test_spdm_requester/error_test/negotiate_algorithms_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/error_test/vendor_request_err.c b/unit_test/test_spdm_requester/error_test/vendor_request_err.c
index dc004981fcb..baf1f75fac8 100644
--- a/unit_test/test_spdm_requester/error_test/vendor_request_err.c
+++ b/unit_test/test_spdm_requester/error_test/vendor_request_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/finish.c b/unit_test/test_spdm_requester/finish.c
index 179b1e2a1ab..1e172c2c77f 100644
--- a/unit_test/test_spdm_requester/finish.c
+++ b/unit_test/test_spdm_requester/finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_capabilities.c b/unit_test/test_spdm_requester/get_capabilities.c
index 67eaf53b21e..098ede516bf 100644
--- a/unit_test/test_spdm_requester/get_capabilities.c
+++ b/unit_test/test_spdm_requester/get_capabilities.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_certificate.c b/unit_test/test_spdm_requester/get_certificate.c
index c093a3d1575..57004771a08 100644
--- a/unit_test/test_spdm_requester/get_certificate.c
+++ b/unit_test/test_spdm_requester/get_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_csr.c b/unit_test/test_spdm_requester/get_csr.c
index 094e14e4d9d..1b9f6fde566 100644
--- a/unit_test/test_spdm_requester/get_csr.c
+++ b/unit_test/test_spdm_requester/get_csr.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_digests.c b/unit_test/test_spdm_requester/get_digests.c
index 09902b522d1..dd54f1073a5 100644
--- a/unit_test/test_spdm_requester/get_digests.c
+++ b/unit_test/test_spdm_requester/get_digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_event_types.c b/unit_test/test_spdm_requester/get_event_types.c
index 689d3af2638..393713bb85d 100644
--- a/unit_test/test_spdm_requester/get_event_types.c
+++ b/unit_test/test_spdm_requester/get_event_types.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_measurement_extension_log.c b/unit_test/test_spdm_requester/get_measurement_extension_log.c
index 0b70234f941..d1320ee09ee 100644
--- a/unit_test/test_spdm_requester/get_measurement_extension_log.c
+++ b/unit_test/test_spdm_requester/get_measurement_extension_log.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_measurements.c b/unit_test/test_spdm_requester/get_measurements.c
index 7a9cb95327e..55c79239472 100644
--- a/unit_test/test_spdm_requester/get_measurements.c
+++ b/unit_test/test_spdm_requester/get_measurements.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/get_version.c b/unit_test/test_spdm_requester/get_version.c
index a0dc93e1b0e..33afb923e99 100644
--- a/unit_test/test_spdm_requester/get_version.c
+++ b/unit_test/test_spdm_requester/get_version.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/heartbeat.c b/unit_test/test_spdm_requester/heartbeat.c
index 55af719c5eb..db6bed99e1b 100644
--- a/unit_test/test_spdm_requester/heartbeat.c
+++ b/unit_test/test_spdm_requester/heartbeat.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/key_exchange.c b/unit_test/test_spdm_requester/key_exchange.c
index d63d9753fbe..36b2c78c426 100644
--- a/unit_test/test_spdm_requester/key_exchange.c
+++ b/unit_test/test_spdm_requester/key_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/key_update.c b/unit_test/test_spdm_requester/key_update.c
index 5f17923f956..f43abd45dec 100644
--- a/unit_test/test_spdm_requester/key_update.c
+++ b/unit_test/test_spdm_requester/key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/negotiate_algorithms.c b/unit_test/test_spdm_requester/negotiate_algorithms.c
index 839d03e288a..c66b2ce40b2 100644
--- a/unit_test/test_spdm_requester/negotiate_algorithms.c
+++ b/unit_test/test_spdm_requester/negotiate_algorithms.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/psk_exchange.c b/unit_test/test_spdm_requester/psk_exchange.c
index 9fd4620fd36..86ff88470fb 100644
--- a/unit_test/test_spdm_requester/psk_exchange.c
+++ b/unit_test/test_spdm_requester/psk_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/psk_finish.c b/unit_test/test_spdm_requester/psk_finish.c
index 7c8b95cd3b6..1e830ef1e70 100644
--- a/unit_test/test_spdm_requester/psk_finish.c
+++ b/unit_test/test_spdm_requester/psk_finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/set_certificate.c b/unit_test/test_spdm_requester/set_certificate.c
index 1d0770b12b3..64ec1be4be5 100644
--- a/unit_test/test_spdm_requester/set_certificate.c
+++ b/unit_test/test_spdm_requester/set_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/test_spdm_requester.c b/unit_test/test_spdm_requester/test_spdm_requester.c
index 257f5039b50..13f28089778 100644
--- a/unit_test/test_spdm_requester/test_spdm_requester.c
+++ b/unit_test/test_spdm_requester/test_spdm_requester.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_requester/vendor_request.c b/unit_test/test_spdm_requester/vendor_request.c
index f3146575453..846e323b378 100644
--- a/unit_test/test_spdm_requester/vendor_request.c
+++ b/unit_test/test_spdm_requester/vendor_request.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/algorithms.c b/unit_test/test_spdm_responder/algorithms.c
index 1f2e0e7847f..06dd2e6b0d5 100644
--- a/unit_test/test_spdm_responder/algorithms.c
+++ b/unit_test/test_spdm_responder/algorithms.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/capabilities.c b/unit_test/test_spdm_responder/capabilities.c
index f7c7a5bd903..9552c6160b0 100644
--- a/unit_test/test_spdm_responder/capabilities.c
+++ b/unit_test/test_spdm_responder/capabilities.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/certificate.c b/unit_test/test_spdm_responder/certificate.c
index 4105a377c45..b4eab92bad4 100644
--- a/unit_test/test_spdm_responder/certificate.c
+++ b/unit_test/test_spdm_responder/certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/challenge_auth.c b/unit_test/test_spdm_responder/challenge_auth.c
index bf6bfc8c44d..5ad477e75de 100644
--- a/unit_test/test_spdm_responder/challenge_auth.c
+++ b/unit_test/test_spdm_responder/challenge_auth.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/chunk_get.c b/unit_test/test_spdm_responder/chunk_get.c
index 2577da302ca..eca411e1a96 100644
--- a/unit_test/test_spdm_responder/chunk_get.c
+++ b/unit_test/test_spdm_responder/chunk_get.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/chunk_send_ack.c b/unit_test/test_spdm_responder/chunk_send_ack.c
index 66427634b8c..6dbae6d80c9 100644
--- a/unit_test/test_spdm_responder/chunk_send_ack.c
+++ b/unit_test/test_spdm_responder/chunk_send_ack.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/csr.c b/unit_test/test_spdm_responder/csr.c
index ae41ce2a985..a867c1cb0e6 100644
--- a/unit_test/test_spdm_responder/csr.c
+++ b/unit_test/test_spdm_responder/csr.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/digests.c b/unit_test/test_spdm_responder/digests.c
index 308530fb789..8537c6a56b4 100644
--- a/unit_test/test_spdm_responder/digests.c
+++ b/unit_test/test_spdm_responder/digests.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/encap_challenge.c b/unit_test/test_spdm_responder/encap_challenge.c
index 8fc030562c0..291871874e7 100644
--- a/unit_test/test_spdm_responder/encap_challenge.c
+++ b/unit_test/test_spdm_responder/encap_challenge.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/encap_get_certificate.c b/unit_test/test_spdm_responder/encap_get_certificate.c
index 49d2dd45274..1732de35ef8 100644
--- a/unit_test/test_spdm_responder/encap_get_certificate.c
+++ b/unit_test/test_spdm_responder/encap_get_certificate.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 #include "spdm_unit_test.h"
 #include "internal/libspdm_responder_lib.h"
diff --git a/unit_test/test_spdm_responder/encap_get_digests.c b/unit_test/test_spdm_responder/encap_get_digests.c
index 94cac23d7a7..387ccf59e15 100644
--- a/unit_test/test_spdm_responder/encap_get_digests.c
+++ b/unit_test/test_spdm_responder/encap_get_digests.c
@@ -1,9 +1,8 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link:
- * https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
+
 #include "spdm_unit_test.h"
 #include "internal/libspdm_responder_lib.h"
 
diff --git a/unit_test/test_spdm_responder/encap_key_update.c b/unit_test/test_spdm_responder/encap_key_update.c
index 293549c230e..7bbe80c350d 100644
--- a/unit_test/test_spdm_responder/encap_key_update.c
+++ b/unit_test/test_spdm_responder/encap_key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 #include "spdm_unit_test.h"
 #include "internal/libspdm_secured_message_lib.h"
diff --git a/unit_test/test_spdm_responder/encap_response.c b/unit_test/test_spdm_responder/encap_response.c
index 0fb7dea5083..582b1c9c7f7 100644
--- a/unit_test/test_spdm_responder/encap_response.c
+++ b/unit_test/test_spdm_responder/encap_response.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/end_session.c b/unit_test/test_spdm_responder/end_session.c
index b757d012083..f6644059652 100644
--- a/unit_test/test_spdm_responder/end_session.c
+++ b/unit_test/test_spdm_responder/end_session.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/error_test/supported_event_types_err.c b/unit_test/test_spdm_responder/error_test/supported_event_types_err.c
index 39eb9618b6c..f6876736f6b 100644
--- a/unit_test/test_spdm_responder/error_test/supported_event_types_err.c
+++ b/unit_test/test_spdm_responder/error_test/supported_event_types_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/error_test/vendor_response_err.c b/unit_test/test_spdm_responder/error_test/vendor_response_err.c
index 2aa8c065f86..a138deffdca 100644
--- a/unit_test/test_spdm_responder/error_test/vendor_response_err.c
+++ b/unit_test/test_spdm_responder/error_test/vendor_response_err.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 
diff --git a/unit_test/test_spdm_responder/finish.c b/unit_test/test_spdm_responder/finish.c
index 9f0bce55f4d..f9075dff9ed 100644
--- a/unit_test/test_spdm_responder/finish.c
+++ b/unit_test/test_spdm_responder/finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/heartbeat.c b/unit_test/test_spdm_responder/heartbeat.c
index 933709fcc5f..43b6aee1151 100644
--- a/unit_test/test_spdm_responder/heartbeat.c
+++ b/unit_test/test_spdm_responder/heartbeat.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/key_exchange.c b/unit_test/test_spdm_responder/key_exchange.c
index 29bdbaa54ea..dc940bc1e8c 100644
--- a/unit_test/test_spdm_responder/key_exchange.c
+++ b/unit_test/test_spdm_responder/key_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/key_update.c b/unit_test/test_spdm_responder/key_update.c
index 6efdb257171..9b347640f2a 100644
--- a/unit_test/test_spdm_responder/key_update.c
+++ b/unit_test/test_spdm_responder/key_update.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/measurement_extension_log.c b/unit_test/test_spdm_responder/measurement_extension_log.c
index c6bdd7d3605..7ab71e3fbd0 100644
--- a/unit_test/test_spdm_responder/measurement_extension_log.c
+++ b/unit_test/test_spdm_responder/measurement_extension_log.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/measurements.c b/unit_test/test_spdm_responder/measurements.c
index 8deb8e9d504..07db1ca99f7 100644
--- a/unit_test/test_spdm_responder/measurements.c
+++ b/unit_test/test_spdm_responder/measurements.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/psk_exchange.c b/unit_test/test_spdm_responder/psk_exchange.c
index 7d743c43c44..57e10639535 100644
--- a/unit_test/test_spdm_responder/psk_exchange.c
+++ b/unit_test/test_spdm_responder/psk_exchange.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/psk_finish.c b/unit_test/test_spdm_responder/psk_finish.c
index cae0cc5c4f3..f5ea6c471b0 100644
--- a/unit_test/test_spdm_responder/psk_finish.c
+++ b/unit_test/test_spdm_responder/psk_finish.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/receive_send.c b/unit_test/test_spdm_responder/receive_send.c
index 9b9daf285ab..490dd889d8d 100644
--- a/unit_test/test_spdm_responder/receive_send.c
+++ b/unit_test/test_spdm_responder/receive_send.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/respond_if_ready.c b/unit_test/test_spdm_responder/respond_if_ready.c
index e641c8b4b40..d0d87725368 100644
--- a/unit_test/test_spdm_responder/respond_if_ready.c
+++ b/unit_test/test_spdm_responder/respond_if_ready.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/set_certificate_rsp.c b/unit_test/test_spdm_responder/set_certificate_rsp.c
index c8a6160c5d2..8e80ad721fd 100644
--- a/unit_test/test_spdm_responder/set_certificate_rsp.c
+++ b/unit_test/test_spdm_responder/set_certificate_rsp.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/supported_event_types.c b/unit_test/test_spdm_responder/supported_event_types.c
index d3407e486c9..0e18c31f8c5 100644
--- a/unit_test/test_spdm_responder/supported_event_types.c
+++ b/unit_test/test_spdm_responder/supported_event_types.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/test_spdm_responder.c b/unit_test/test_spdm_responder/test_spdm_responder.c
index 40643f0112f..1b05b9b0f41 100644
--- a/unit_test/test_spdm_responder/test_spdm_responder.c
+++ b/unit_test/test_spdm_responder/test_spdm_responder.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/vendor_response.c b/unit_test/test_spdm_responder/vendor_response.c
index 4471c4bb90f..d381c13a157 100644
--- a/unit_test/test_spdm_responder/vendor_response.c
+++ b/unit_test/test_spdm_responder/vendor_response.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_responder/version.c b/unit_test/test_spdm_responder/version.c
index 5cf92edec66..1ffd88ef3eb 100644
--- a/unit_test/test_spdm_responder/version.c
+++ b/unit_test/test_spdm_responder/version.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_sample/test_spdm_sample.c b/unit_test/test_spdm_sample/test_spdm_sample.c
index ad31c47ea04..f5e979930d5 100644
--- a/unit_test/test_spdm_sample/test_spdm_sample.c
+++ b/unit_test/test_spdm_sample/test_spdm_sample.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #define LIBSPDM_MAX_CERT_CHAIN_SIZE 0x2000
diff --git a/unit_test/test_spdm_secured_message/encode_decode.c b/unit_test/test_spdm_secured_message/encode_decode.c
index 2d934d3a0c1..e4958cde95b 100644
--- a/unit_test/test_spdm_secured_message/encode_decode.c
+++ b/unit_test/test_spdm_secured_message/encode_decode.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 #include "spdm_unit_test.h"
diff --git a/unit_test/test_spdm_secured_message/test_spdm_secured_message.c b/unit_test/test_spdm_secured_message/test_spdm_secured_message.c
index f71351b68b6..4a9db71d74d 100644
--- a/unit_test/test_spdm_secured_message/test_spdm_secured_message.c
+++ b/unit_test/test_spdm_secured_message/test_spdm_secured_message.c
@@ -1,7 +1,6 @@
 /**
- *  Copyright Notice:
- *  Copyright 2023 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: 2023-2024 DMTF
+ * SPDX-License-Identifier: BSD-3-Clause
  **/
 
 extern int libspdm_secured_message_encode_decode_test_main(void);

From 3afd2be272647c3bb889b5534299d5efcafac4af Mon Sep 17 00:00:00 2001
From: Gilg Heike <Heike.Gilg@infineon.com>
Date: Mon, 29 Jul 2024 18:17:33 +0200
Subject: [PATCH 2/7] Update mixed licensed headers to SPDX format

- Update license and copyright headers to SPDX which were originally
  licensed under Apache-2.0, Apache-2.0 with llvm-exception or
GPL-2.0-or-later
- Remove additionally added BSD-3-Clause license identifier

Signed-off-by: Gilg Heike <Heike.Gilg@infineon.com>
---
 os_stub/armbuild_lib/div64.c                  | 12 +++---------
 .../include/mbedtls/libspdm_mbedtls_config.h  | 10 +++-------
 unit_test/fuzzing/oss-fuzz_conf/Dockerfile    | 17 ++---------------
 unit_test/fuzzing/oss-fuzz_conf/build.sh      | 19 ++++---------------
 unit_test/test_size/intrinsiclib/ashldi3.c    | 11 +++--------
 5 files changed, 15 insertions(+), 54 deletions(-)

diff --git a/os_stub/armbuild_lib/div64.c b/os_stub/armbuild_lib/div64.c
index de8c1c61a06..1af8f37121c 100644
--- a/os_stub/armbuild_lib/div64.c
+++ b/os_stub/armbuild_lib/div64.c
@@ -1,16 +1,10 @@
 /**
- * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- * See https://llvm.org/LICENSE.txt for license information.
+ * SPDX-FileCopyrightText: 2003-2019 University of Illinois at Urbana-Champaign.
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  **/
 
-/*Portions of this file have been modified from the original (https://github.com/llvm/llvm-project/blob/main/compiler-rt/lib/builtins/udivmodti4.c) under the following copyright and license.*/
-
-/**
- *  Copyright Notice:
- *  Copyright 2021-2022 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
- **/
+/*Portions of this file have been modified from the original (https://github.com/llvm/llvm-project/blob/main/compiler-rt/lib/builtins/udivmodti4.c).*/
 
 typedef int si_int;
 typedef unsigned su_int;
diff --git a/os_stub/mbedtlslib/include/mbedtls/libspdm_mbedtls_config.h b/os_stub/mbedtlslib/include/mbedtls/libspdm_mbedtls_config.h
index c8d30b2c70b..675e9ae5a0a 100644
--- a/os_stub/mbedtlslib/include/mbedtls/libspdm_mbedtls_config.h
+++ b/os_stub/mbedtlslib/include/mbedtls/libspdm_mbedtls_config.h
@@ -1,7 +1,7 @@
 /**
- *  Copyright Notice:
- *  Copyright 2021-2024 DMTF. All rights reserved.
- *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
+ * SPDX-FileCopyrightText: The Mbed TLS Contributors
+ * SPDX-FileCopyrightText: 2021-2024 DMTF
+ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  **/
 
 /**
@@ -15,10 +15,6 @@
  *  or disable features selectively, and reduce the global
  *  memory footprint.
  */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- */
 
 /**
  * This is an optional version symbol that enables compatibility handling of
diff --git a/unit_test/fuzzing/oss-fuzz_conf/Dockerfile b/unit_test/fuzzing/oss-fuzz_conf/Dockerfile
index 538bba226db..2bc431a994e 100644
--- a/unit_test/fuzzing/oss-fuzz_conf/Dockerfile
+++ b/unit_test/fuzzing/oss-fuzz_conf/Dockerfile
@@ -1,19 +1,6 @@
-# Copyright 2022 Google LLC
+# SPDX-FileCopyrightText: 2022 Google LLC
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
+# SPDX-License-Identifier: Apache-2.0
 FROM gcr.io/oss-fuzz-base/base-builder
 #ENV http_proxy 'http://proxy.example.com:80/'
 #ENV https_proxy 'https://proxy.example.com:80/'
diff --git a/unit_test/fuzzing/oss-fuzz_conf/build.sh b/unit_test/fuzzing/oss-fuzz_conf/build.sh
index da2152c91e0..7c69ac9541c 100755
--- a/unit_test/fuzzing/oss-fuzz_conf/build.sh
+++ b/unit_test/fuzzing/oss-fuzz_conf/build.sh
@@ -1,19 +1,8 @@
-#!/bin/bash -eu
-# Copyright 2022 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
+# SPDX-FileCopyrightText: 2022 Google LLC
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
+# SPDX-License-Identifier: Apache-2.0
+
+#!/bin/bash -eu
 
 # build project
 # e.g.
diff --git a/unit_test/test_size/intrinsiclib/ashldi3.c b/unit_test/test_size/intrinsiclib/ashldi3.c
index b76a300b853..f3e772d1b80 100644
--- a/unit_test/test_size/intrinsiclib/ashldi3.c
+++ b/unit_test/test_size/intrinsiclib/ashldi3.c
@@ -1,16 +1,11 @@
 /**
+ * SPDX-FileCopyrightText: 2003-2019 University of Illinois at Urbana-Champaign.
  * SPDX-FileCopyrightText: 2021-2024 DMTF
- * SPDX-License-Identifier: BSD-3-Clause
- **/
-
-/*Portions of this file have been modified from the original (https://github.com/intel/linux-sgx/blob/master/sdk/compiler-rt/ashldi3.c) under the following copyright and license.*/
-
-/**
- * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
- * See https://llvm.org/LICENSE.txt for license information.
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  **/
 
+/*Portions of this file have been modified from the original (https://github.com/intel/linux-sgx/blob/master/sdk/compiler-rt/ashldi3.c).*/
+
 typedef int si_int;
 typedef unsigned su_int;
 typedef long long di_int;

From 6d95fcbee8544e3ed11489dcaf8f6615ac3a2dba Mon Sep 17 00:00:00 2001
From: Gilg Heike <Heike.Gilg@infineon.com>
Date: Mon, 29 Jul 2024 17:06:32 +0200
Subject: [PATCH 3/7] Add SPDX compliant headers to CMakeLists.txt files

- Put all CMakeLists.txt file under BSD-3-Clause license
- Add copyright date from 2021-2024 for all CMakeLists.txt files

Signed-off-by: Gilg Heike <Heike.Gilg@infineon.com>
---
 CMakeLists.txt                                            | 4 ++++
 library/spdm_common_lib/CMakeLists.txt                    | 4 ++++
 library/spdm_crypt_lib/CMakeLists.txt                     | 4 ++++
 library/spdm_requester_lib/CMakeLists.txt                 | 4 ++++
 library/spdm_responder_lib/CMakeLists.txt                 | 4 ++++
 library/spdm_secured_message_lib/CMakeLists.txt           | 4 ++++
 library/spdm_transport_mctp_lib/CMakeLists.txt            | 4 ++++
 library/spdm_transport_pcidoe_lib/CMakeLists.txt          | 4 ++++
 os_stub/armbuild_lib/CMakeLists.txt                       | 4 ++++
 os_stub/cryptlib_mbedtls/CMakeLists.txt                   | 4 ++++
 os_stub/cryptlib_null/CMakeLists.txt                      | 4 ++++
 os_stub/cryptlib_openssl/CMakeLists.txt                   | 4 ++++
 os_stub/debuglib/CMakeLists.txt                           | 4 ++++
 os_stub/debuglib_null/CMakeLists.txt                      | 4 ++++
 os_stub/malloclib/CMakeLists.txt                          | 4 ++++
 os_stub/mbedtlslib/CMakeLists.txt                         | 4 ++++
 os_stub/memlib/CMakeLists.txt                             | 4 ++++
 os_stub/openssllib/CMakeLists.txt                         | 4 ++++
 os_stub/platform_lib/CMakeLists.txt                       | 4 ++++
 os_stub/platform_lib_null/CMakeLists.txt                  | 4 ++++
 os_stub/rnglib/CMakeLists.txt                             | 4 ++++
 os_stub/spdm_cert_verify_callback_sample/CMakeLists.txt   | 4 ++++
 os_stub/spdm_crypt_ext_lib/CMakeLists.txt                 | 4 ++++
 os_stub/spdm_device_secret_lib_null/CMakeLists.txt        | 4 ++++
 os_stub/spdm_device_secret_lib_sample/CMakeLists.txt      | 4 ++++
 unit_test/cmockalib/CMakeLists.txt                        | 4 ++++
 .../test_spdm_requester_challenge/CMakeLists.txt          | 4 ++++
 .../test_spdm_requester_chunk_get/CMakeLists.txt          | 4 ++++
 .../test_spdm_requester_chunk_send/CMakeLists.txt         | 4 ++++
 .../test_spdm_requester_encap_certificate/CMakeLists.txt  | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../test_spdm_requester_encap_digests/CMakeLists.txt      | 4 ++++
 .../test_spdm_requester_encap_key_update/CMakeLists.txt   | 4 ++++
 .../test_spdm_requester_encap_request/CMakeLists.txt      | 4 ++++
 .../test_spdm_requester_end_session/CMakeLists.txt        | 4 ++++
 .../test_spdm_requester_finish/CMakeLists.txt             | 4 ++++
 .../test_spdm_requester_get_capabilities/CMakeLists.txt   | 4 ++++
 .../test_spdm_requester_get_certificate/CMakeLists.txt    | 4 ++++
 .../test_spdm_requester_get_csr/CMakeLists.txt            | 4 ++++
 .../test_spdm_requester_get_digests/CMakeLists.txt        | 4 ++++
 .../test_spdm_requester_get_event_types/CMakeLists.txt    | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../test_spdm_requester_get_measurements/CMakeLists.txt   | 4 ++++
 .../test_spdm_requester_get_version/CMakeLists.txt        | 4 ++++
 .../test_spdm_requester_heartbeat/CMakeLists.txt          | 4 ++++
 .../test_spdm_requester_key_exchange/CMakeLists.txt       | 4 ++++
 .../test_spdm_requester_key_update/CMakeLists.txt         | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../test_spdm_requester_psk_exchange/CMakeLists.txt       | 4 ++++
 .../test_spdm_requester_psk_finish/CMakeLists.txt         | 4 ++++
 .../test_spdm_requester_set_certificate/CMakeLists.txt    | 4 ++++
 .../test_spdm_requester_vendor_cmds/CMakeLists.txt        | 4 ++++
 .../test_spdm_responder_algorithms/CMakeLists.txt         | 4 ++++
 .../test_spdm_responder_capabilities/CMakeLists.txt       | 4 ++++
 .../test_spdm_responder_certificate/CMakeLists.txt        | 4 ++++
 .../test_spdm_responder_challenge_auth/CMakeLists.txt     | 4 ++++
 .../test_spdm_responder_chunk_get/CMakeLists.txt          | 4 ++++
 .../test_spdm_responder_chunk_send_ack/CMakeLists.txt     | 4 ++++
 .../test_responder/test_spdm_responder_csr/CMakeLists.txt | 4 ++++
 .../test_spdm_responder_digests/CMakeLists.txt            | 4 ++++
 .../test_spdm_responder_encap_challenge/CMakeLists.txt    | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../test_spdm_responder_encap_get_digests/CMakeLists.txt  | 4 ++++
 .../test_spdm_responder_encap_key_update/CMakeLists.txt   | 4 ++++
 .../test_spdm_responder_encap_response/CMakeLists.txt     | 4 ++++
 .../test_spdm_responder_end_session/CMakeLists.txt        | 4 ++++
 .../test_spdm_responder_finish_rsp/CMakeLists.txt         | 4 ++++
 .../test_spdm_responder_heartbeat_ack/CMakeLists.txt      | 4 ++++
 .../test_spdm_responder_if_ready/CMakeLists.txt           | 4 ++++
 .../test_spdm_responder_key_exchange/CMakeLists.txt       | 4 ++++
 .../test_spdm_responder_key_update/CMakeLists.txt         | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../test_spdm_responder_measurements/CMakeLists.txt       | 4 ++++
 .../test_spdm_responder_psk_exchange_rsp/CMakeLists.txt   | 4 ++++
 .../test_spdm_responder_psk_finish_rsp/CMakeLists.txt     | 4 ++++
 .../test_spdm_responder_set_certificate/CMakeLists.txt    | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../test_spdm_responder_vendor_cmds/CMakeLists.txt        | 4 ++++
 .../test_spdm_responder_version/CMakeLists.txt            | 4 ++++
 .../test_spdm_decode_secured_message/CMakeLists.txt       | 4 ++++
 .../test_spdm_encode_secured_message/CMakeLists.txt       | 4 ++++
 .../test_process_opaque_data/CMakeLists.txt               | 4 ++++
 .../test_x509_certificate_check/CMakeLists.txt            | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 .../CMakeLists.txt                                        | 4 ++++
 unit_test/spdm_transport_test_lib/CMakeLists.txt          | 4 ++++
 unit_test/test_crypt/CMakeLists.txt                       | 8 ++++++++
 unit_test/test_size/cryptstublib_dummy/CMakeLists.txt     | 4 ++++
 unit_test/test_size/intrinsiclib/CMakeLists.txt           | 4 ++++
 unit_test/test_size/malloclib_null/CMakeLists.txt         | 4 ++++
 unit_test/test_size/malloclib_simple/CMakeLists.txt       | 4 ++++
 unit_test/test_size/rnglib_null/CMakeLists.txt            | 4 ++++
 .../test_size/test_size_of_spdm_requester/CMakeLists.txt  | 4 ++++
 .../test_size/test_size_of_spdm_responder/CMakeLists.txt  | 4 ++++
 unit_test/test_spdm_common/CMakeLists.txt                 | 4 ++++
 unit_test/test_spdm_crypt/CMakeLists.txt                  | 4 ++++
 unit_test/test_spdm_fips/CMakeLists.txt                   | 4 ++++
 unit_test/test_spdm_requester/CMakeLists.txt              | 4 ++++
 unit_test/test_spdm_responder/CMakeLists.txt              | 4 ++++
 unit_test/test_spdm_sample/CMakeLists.txt                 | 4 ++++
 unit_test/test_spdm_secured_message/CMakeLists.txt        | 4 ++++
 103 files changed, 416 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a88b173ab9..20cc84d2423 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 project("libspdm" C)
diff --git a/library/spdm_common_lib/CMakeLists.txt b/library/spdm_common_lib/CMakeLists.txt
index db3e44c47c0..63bda075ca8 100644
--- a/library/spdm_common_lib/CMakeLists.txt
+++ b/library/spdm_common_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_common_lib STATIC "")
diff --git a/library/spdm_crypt_lib/CMakeLists.txt b/library/spdm_crypt_lib/CMakeLists.txt
index cebd1fedc83..dfc7dcbc448 100644
--- a/library/spdm_crypt_lib/CMakeLists.txt
+++ b/library/spdm_crypt_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_crypt_lib STATIC "")
diff --git a/library/spdm_requester_lib/CMakeLists.txt b/library/spdm_requester_lib/CMakeLists.txt
index a49ad514053..1728daf8b7a 100644
--- a/library/spdm_requester_lib/CMakeLists.txt
+++ b/library/spdm_requester_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_requester_lib STATIC "")
diff --git a/library/spdm_responder_lib/CMakeLists.txt b/library/spdm_responder_lib/CMakeLists.txt
index 03880eddc1d..a91ba6bc60e 100644
--- a/library/spdm_responder_lib/CMakeLists.txt
+++ b/library/spdm_responder_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_responder_lib STATIC "")
diff --git a/library/spdm_secured_message_lib/CMakeLists.txt b/library/spdm_secured_message_lib/CMakeLists.txt
index 77ab662b8fd..d89e6705490 100644
--- a/library/spdm_secured_message_lib/CMakeLists.txt
+++ b/library/spdm_secured_message_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_secured_message_lib STATIC "")
diff --git a/library/spdm_transport_mctp_lib/CMakeLists.txt b/library/spdm_transport_mctp_lib/CMakeLists.txt
index 9b2eddecf14..68a4b7dc29f 100644
--- a/library/spdm_transport_mctp_lib/CMakeLists.txt
+++ b/library/spdm_transport_mctp_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_transport_mctp_lib STATIC "")
diff --git a/library/spdm_transport_pcidoe_lib/CMakeLists.txt b/library/spdm_transport_pcidoe_lib/CMakeLists.txt
index 74ab1a55775..452072de448 100644
--- a/library/spdm_transport_pcidoe_lib/CMakeLists.txt
+++ b/library/spdm_transport_pcidoe_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_transport_pcidoe_lib STATIC "")
diff --git a/os_stub/armbuild_lib/CMakeLists.txt b/os_stub/armbuild_lib/CMakeLists.txt
index 0f23a5d3164..62cd1805727 100644
--- a/os_stub/armbuild_lib/CMakeLists.txt
+++ b/os_stub/armbuild_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(armbuild_lib STATIC "")
diff --git a/os_stub/cryptlib_mbedtls/CMakeLists.txt b/os_stub/cryptlib_mbedtls/CMakeLists.txt
index a7d5301cac6..add87ea6688 100644
--- a/os_stub/cryptlib_mbedtls/CMakeLists.txt
+++ b/os_stub/cryptlib_mbedtls/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(cryptlib_mbedtls STATIC "")
diff --git a/os_stub/cryptlib_null/CMakeLists.txt b/os_stub/cryptlib_null/CMakeLists.txt
index 6c72f34bab1..5e9a9bfbeec 100644
--- a/os_stub/cryptlib_null/CMakeLists.txt
+++ b/os_stub/cryptlib_null/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(cryptlib_null STATIC "")
diff --git a/os_stub/cryptlib_openssl/CMakeLists.txt b/os_stub/cryptlib_openssl/CMakeLists.txt
index cad55aeadd5..15db281e02f 100644
--- a/os_stub/cryptlib_openssl/CMakeLists.txt
+++ b/os_stub/cryptlib_openssl/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(cryptlib_openssl STATIC "")
diff --git a/os_stub/debuglib/CMakeLists.txt b/os_stub/debuglib/CMakeLists.txt
index 5426edb8941..98cb9fe8461 100644
--- a/os_stub/debuglib/CMakeLists.txt
+++ b/os_stub/debuglib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(debuglib STATIC "")
diff --git a/os_stub/debuglib_null/CMakeLists.txt b/os_stub/debuglib_null/CMakeLists.txt
index fec1c8e4d7b..bef66720ba4 100644
--- a/os_stub/debuglib_null/CMakeLists.txt
+++ b/os_stub/debuglib_null/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(debuglib_null STATIC "")
diff --git a/os_stub/malloclib/CMakeLists.txt b/os_stub/malloclib/CMakeLists.txt
index b179b198c24..7276e730bea 100644
--- a/os_stub/malloclib/CMakeLists.txt
+++ b/os_stub/malloclib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(malloclib STATIC "")
diff --git a/os_stub/mbedtlslib/CMakeLists.txt b/os_stub/mbedtlslib/CMakeLists.txt
index 656de471e8a..18dc89622d3 100644
--- a/os_stub/mbedtlslib/CMakeLists.txt
+++ b/os_stub/mbedtlslib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 if(LIB_INSTALL_DIR)
diff --git a/os_stub/memlib/CMakeLists.txt b/os_stub/memlib/CMakeLists.txt
index 30a233cc097..b5cda6852fd 100644
--- a/os_stub/memlib/CMakeLists.txt
+++ b/os_stub/memlib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(memlib STATIC "")
diff --git a/os_stub/openssllib/CMakeLists.txt b/os_stub/openssllib/CMakeLists.txt
index 0361e84eea7..b3692d595a0 100644
--- a/os_stub/openssllib/CMakeLists.txt
+++ b/os_stub/openssllib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(openssllib STATIC "")
diff --git a/os_stub/platform_lib/CMakeLists.txt b/os_stub/platform_lib/CMakeLists.txt
index 0277762fc59..23ae27a8587 100644
--- a/os_stub/platform_lib/CMakeLists.txt
+++ b/os_stub/platform_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(platform_lib STATIC "")
diff --git a/os_stub/platform_lib_null/CMakeLists.txt b/os_stub/platform_lib_null/CMakeLists.txt
index 7007070acc3..15bd65a76f9 100644
--- a/os_stub/platform_lib_null/CMakeLists.txt
+++ b/os_stub/platform_lib_null/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(platform_lib_null STATIC "")
diff --git a/os_stub/rnglib/CMakeLists.txt b/os_stub/rnglib/CMakeLists.txt
index 8c4162035a8..88a2822fdb3 100644
--- a/os_stub/rnglib/CMakeLists.txt
+++ b/os_stub/rnglib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 set(src_rnglib "")
diff --git a/os_stub/spdm_cert_verify_callback_sample/CMakeLists.txt b/os_stub/spdm_cert_verify_callback_sample/CMakeLists.txt
index cd17d681edc..e78cee07803 100644
--- a/os_stub/spdm_cert_verify_callback_sample/CMakeLists.txt
+++ b/os_stub/spdm_cert_verify_callback_sample/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_cert_verify_callback_sample STATIC "")
diff --git a/os_stub/spdm_crypt_ext_lib/CMakeLists.txt b/os_stub/spdm_crypt_ext_lib/CMakeLists.txt
index b8bb1ca0d5e..7910d35c2ba 100644
--- a/os_stub/spdm_crypt_ext_lib/CMakeLists.txt
+++ b/os_stub/spdm_crypt_ext_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_crypt_ext_lib STATIC "")
diff --git a/os_stub/spdm_device_secret_lib_null/CMakeLists.txt b/os_stub/spdm_device_secret_lib_null/CMakeLists.txt
index e05134c310c..f855c6cd22c 100644
--- a/os_stub/spdm_device_secret_lib_null/CMakeLists.txt
+++ b/os_stub/spdm_device_secret_lib_null/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_device_secret_lib_null STATIC "")
diff --git a/os_stub/spdm_device_secret_lib_sample/CMakeLists.txt b/os_stub/spdm_device_secret_lib_sample/CMakeLists.txt
index 4421f05c1c4..2afd339eb1a 100644
--- a/os_stub/spdm_device_secret_lib_sample/CMakeLists.txt
+++ b/os_stub/spdm_device_secret_lib_sample/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_device_secret_lib_sample STATIC "")
diff --git a/unit_test/cmockalib/CMakeLists.txt b/unit_test/cmockalib/CMakeLists.txt
index 133cc1d7367..8c9eab71e7e 100644
--- a/unit_test/cmockalib/CMakeLists.txt
+++ b/unit_test/cmockalib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(cmockalib STATIC "")
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/CMakeLists.txt
index 426fb49baee..831fa3959c1 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_challenge/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_challenge)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/CMakeLists.txt
index fb6af57908a..e467d7a5e52 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_get/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_chunk_get)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/CMakeLists.txt
index b6a4bfd47b6..a9c47ef4c0d 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_chunk_send/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_chunk_send)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/CMakeLists.txt
index 64fd8dd49f4..af55326e41a 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_certificate/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_encap_certificate)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/CMakeLists.txt
index 0fc61fcbebd..a55f3fc26a5 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_challenge_auth/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_encap_challenge_auth)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/CMakeLists.txt
index 3ab2e513a04..a2c3a063a2e 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_digests/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_encap_digests)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/CMakeLists.txt
index 47cf72124f5..9880e3cdf4c 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_key_update/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_encap_key_update)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/CMakeLists.txt
index 0ad800a854c..9fe438e7c91 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_encap_request/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_encap_request)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/CMakeLists.txt
index 884c32b6f68..ae81fa67be1 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_end_session/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_end_session)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_finish/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_finish/CMakeLists.txt
index 176441e5b86..e1253be9257 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_finish/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_finish/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_finish)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/CMakeLists.txt
index d0c78a8a129..054507d05aa 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_capabilities/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_capabilities)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/CMakeLists.txt
index c56a2e89a33..16b6de0a2f0 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_certificate/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_certificate)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/CMakeLists.txt
index 964a399774e..87579b6789b 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_csr/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_csr)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/CMakeLists.txt
index f3d482c051b..f3742a4726a 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_digests/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_digests)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/CMakeLists.txt
index a0d7783952f..42a78be1ceb 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_event_types/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_event_types)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/CMakeLists.txt
index 5c26b57f7ef..99e53743def 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurement_extension_log/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_measurement_extension_log)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/CMakeLists.txt
index b18e0bc694a..296df792283 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_measurements/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_measurements)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/CMakeLists.txt
index 5eec690cf68..511a9b676d1 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_get_version/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_get_version)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/CMakeLists.txt
index 4d13004365f..d829f54f40a 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_heartbeat/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_heartbeat)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/CMakeLists.txt
index 2bbb9392184..ff2714a2e81 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_key_exchange/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_key_exchange)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/CMakeLists.txt
index 208d8598fad..a468c9e0cef 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_key_update/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_key_update)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/CMakeLists.txt
index c6c9e861e4e..75ce898e721 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_negotiate_algorithms/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_negotiate_algorithms)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/CMakeLists.txt
index 63c2ca97073..294a5d58d5a 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_exchange/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_psk_exchange)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/CMakeLists.txt
index a95fe21ed7e..6f4742449c4 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_psk_finish/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_psk_finish)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/CMakeLists.txt
index fcc6db22af5..5e8b151a2d5 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_set_certificate/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_set_certificate)
diff --git a/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/CMakeLists.txt b/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/CMakeLists.txt
index df1be3b0385..9ddfba339c6 100644
--- a/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/CMakeLists.txt
+++ b/unit_test/fuzzing/test_requester/test_spdm_requester_vendor_cmds/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester_vendor_cmds)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/CMakeLists.txt
index 318d6d39d08..44ba8e1707e 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_algorithms/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_algorithms)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/CMakeLists.txt
index 2f385d26142..a60e0033586 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_capabilities/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_capabilities)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/CMakeLists.txt
index 93693498a18..a47f7adf2d0 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_certificate/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_certificate)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/CMakeLists.txt
index 222b6b2c699..401098fa2e7 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_challenge_auth/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_challenge_auth)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/CMakeLists.txt
index 069e1655bb3..1a56a58400b 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_get/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_chunk_get)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/CMakeLists.txt
index f805433b00d..353dc49b90b 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_chunk_send_ack/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_chunk_send_ack)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_csr/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_csr/CMakeLists.txt
index 8ed364b4fdb..5cb73e92f21 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_csr/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_csr/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_csr)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_digests/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_digests/CMakeLists.txt
index f9cfa1dcf2d..7b29bf09294 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_digests/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_digests/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_digests)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/CMakeLists.txt
index cd7eb3b48d2..04b1504a5af 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_challenge/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_encap_challenge)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/CMakeLists.txt
index 41ef018ac9d..60570ebab86 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_certificate/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_encap_get_certificate)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/CMakeLists.txt
index 9587706859a..775546e78be 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_get_digests/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_encap_get_digests)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/CMakeLists.txt
index b17e8e6b1e0..937c7364a3f 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_key_update/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_encap_key_update)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/CMakeLists.txt
index bce20f7ba85..0c26e46a6b8 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_encap_response/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_encap_response)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/CMakeLists.txt
index b2c8280fb8d..0cfe4f96e91 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_end_session/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_end_session)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/CMakeLists.txt
index b2ff7982195..fb17365065a 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_finish_rsp/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_finish_rsp)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/CMakeLists.txt
index 9ae072c84f1..ee632f84b56 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_heartbeat_ack/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_heartbeat_ack)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/CMakeLists.txt
index 6989e8690da..adb451b8e98 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_if_ready/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_if_ready)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/CMakeLists.txt
index af732eef19d..cc98cc3bb6d 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_key_exchange/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_key_exchange)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/CMakeLists.txt
index a909b370e8d..09eee728e21 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_key_update/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_key_update)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/CMakeLists.txt
index 88e9b84db3e..436ca8dd3f9 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_measurement_extension_log/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_measurement_extension_log)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/CMakeLists.txt
index fce3c7ed151..f7ccb2862b2 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_measurements/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_measurements)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/CMakeLists.txt
index 3c6d667c673..f1abf686458 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_exchange_rsp/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_psk_exchange_rsp)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/CMakeLists.txt
index b3b18428112..46257a17d09 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_psk_finish_rsp/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_psk_finish_rsp)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/CMakeLists.txt
index d45a4181820..9b6cf54b108 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_set_certificate/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_set_certificate)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/CMakeLists.txt
index a11a85a8122..57d1453a9de 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_supported_event_types/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_supported_event_types)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/CMakeLists.txt
index 394203f1444..a4b0cb42f4f 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_vendor_cmds/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_vendor_cmds)
diff --git a/unit_test/fuzzing/test_responder/test_spdm_responder_version/CMakeLists.txt b/unit_test/fuzzing/test_responder/test_spdm_responder_version/CMakeLists.txt
index e25706deff7..fd2164cfe9d 100644
--- a/unit_test/fuzzing/test_responder/test_spdm_responder_version/CMakeLists.txt
+++ b/unit_test/fuzzing/test_responder/test_spdm_responder_version/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder_version)
diff --git a/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/CMakeLists.txt b/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/CMakeLists.txt
index 7472ebdbb89..882aead7384 100644
--- a/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/CMakeLists.txt
+++ b/unit_test/fuzzing/test_secured_message/test_spdm_decode_secured_message/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_decode_secured_message)
diff --git a/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/CMakeLists.txt b/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/CMakeLists.txt
index d456e75725b..2b20683b6a7 100644
--- a/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/CMakeLists.txt
+++ b/unit_test/fuzzing/test_secured_message/test_spdm_encode_secured_message/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_encode_secured_message)
diff --git a/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/CMakeLists.txt b/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/CMakeLists.txt
index fdda4bf42e2..9bebd8df785 100644
--- a/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/CMakeLists.txt
+++ b/unit_test/fuzzing/test_spdm_common/test_process_opaque_data/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_process_opaque_data_check)
diff --git a/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/CMakeLists.txt b/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/CMakeLists.txt
index e598861910d..9b07c650955 100644
--- a/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/CMakeLists.txt
+++ b/unit_test/fuzzing/test_spdm_crypt/test_x509_certificate_check/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_x509_certificate_check)
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/CMakeLists.txt b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/CMakeLists.txt
index 2908b56d612..f9410d4fa89 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/CMakeLists.txt
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_decode_message/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_transport_mctp_decode_message)
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/CMakeLists.txt b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/CMakeLists.txt
index 6d6ad942cd5..7952c0413a4 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/CMakeLists.txt
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_mctp_encode_message/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_transport_mctp_encode_message)
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/CMakeLists.txt b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/CMakeLists.txt
index d1b3f7282f7..b3486df9bd2 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/CMakeLists.txt
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_decode_message/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_transport_pci_doe_decode_message)
diff --git a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/CMakeLists.txt b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/CMakeLists.txt
index 1ccfc818af7..f2e61ca1796 100644
--- a/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/CMakeLists.txt
+++ b/unit_test/fuzzing/test_transport/test_spdm_transport_pci_doe_encode_message/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_transport_pci_doe_encode_message)
diff --git a/unit_test/spdm_transport_test_lib/CMakeLists.txt b/unit_test/spdm_transport_test_lib/CMakeLists.txt
index bef22353acf..b432a481059 100644
--- a/unit_test/spdm_transport_test_lib/CMakeLists.txt
+++ b/unit_test/spdm_transport_test_lib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(spdm_transport_test_lib STATIC "")
diff --git a/unit_test/test_crypt/CMakeLists.txt b/unit_test/test_crypt/CMakeLists.txt
index 3827ab22436..0fa87e6f59f 100644
--- a/unit_test/test_crypt/CMakeLists.txt
+++ b/unit_test/test_crypt/CMakeLists.txt
@@ -1,5 +1,13 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_crypt)
diff --git a/unit_test/test_size/cryptstublib_dummy/CMakeLists.txt b/unit_test/test_size/cryptstublib_dummy/CMakeLists.txt
index d0a9fa69c39..dd734bee332 100644
--- a/unit_test/test_size/cryptstublib_dummy/CMakeLists.txt
+++ b/unit_test/test_size/cryptstublib_dummy/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(cryptstublib_dummy STATIC "")
diff --git a/unit_test/test_size/intrinsiclib/CMakeLists.txt b/unit_test/test_size/intrinsiclib/CMakeLists.txt
index 6ecb0e6d90e..e6472876496 100644
--- a/unit_test/test_size/intrinsiclib/CMakeLists.txt
+++ b/unit_test/test_size/intrinsiclib/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 if(TOOLCHAIN MATCHES "VS")
diff --git a/unit_test/test_size/malloclib_null/CMakeLists.txt b/unit_test/test_size/malloclib_null/CMakeLists.txt
index c4db7e181ce..f0fbf87cbf7 100644
--- a/unit_test/test_size/malloclib_null/CMakeLists.txt
+++ b/unit_test/test_size/malloclib_null/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(malloclib_null STATIC "")
diff --git a/unit_test/test_size/malloclib_simple/CMakeLists.txt b/unit_test/test_size/malloclib_simple/CMakeLists.txt
index ad7a884a7f1..6502a5a5b91 100644
--- a/unit_test/test_size/malloclib_simple/CMakeLists.txt
+++ b/unit_test/test_size/malloclib_simple/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(malloclib_simple STATIC "")
diff --git a/unit_test/test_size/rnglib_null/CMakeLists.txt b/unit_test/test_size/rnglib_null/CMakeLists.txt
index 2f80682bd5e..bdedb76d628 100644
--- a/unit_test/test_size/rnglib_null/CMakeLists.txt
+++ b/unit_test/test_size/rnglib_null/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_library(rnglib_null STATIC "")
diff --git a/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt b/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt
index 24964d4dab9..93d6fa30459 100644
--- a/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt
+++ b/unit_test/test_size/test_size_of_spdm_requester/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt b/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt
index 1280df68ace..23d1fcf4e34 100644
--- a/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt
+++ b/unit_test/test_size/test_size_of_spdm_responder/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/unit_test/test_spdm_common/CMakeLists.txt b/unit_test/test_spdm_common/CMakeLists.txt
index 718a5e9936e..3704414ed78 100644
--- a/unit_test/test_spdm_common/CMakeLists.txt
+++ b/unit_test/test_spdm_common/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 if(NOT ((TOOLCHAIN STREQUAL "KLEE") OR (TOOLCHAIN STREQUAL "CBMC")))
diff --git a/unit_test/test_spdm_crypt/CMakeLists.txt b/unit_test/test_spdm_crypt/CMakeLists.txt
index a459105abd8..d08e3b1f84b 100644
--- a/unit_test/test_spdm_crypt/CMakeLists.txt
+++ b/unit_test/test_spdm_crypt/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_crypt)
diff --git a/unit_test/test_spdm_fips/CMakeLists.txt b/unit_test/test_spdm_fips/CMakeLists.txt
index 8b9e5fe06d6..991f46b691d 100644
--- a/unit_test/test_spdm_fips/CMakeLists.txt
+++ b/unit_test/test_spdm_fips/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_fips)
diff --git a/unit_test/test_spdm_requester/CMakeLists.txt b/unit_test/test_spdm_requester/CMakeLists.txt
index dd16ffc018e..4182ff17225 100644
--- a/unit_test/test_spdm_requester/CMakeLists.txt
+++ b/unit_test/test_spdm_requester/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_requester)
diff --git a/unit_test/test_spdm_responder/CMakeLists.txt b/unit_test/test_spdm_responder/CMakeLists.txt
index 5a053d12dd1..a3ee5885b55 100644
--- a/unit_test/test_spdm_responder/CMakeLists.txt
+++ b/unit_test/test_spdm_responder/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_responder)
diff --git a/unit_test/test_spdm_sample/CMakeLists.txt b/unit_test/test_spdm_sample/CMakeLists.txt
index d353ad56dc1..2db53fa87b1 100644
--- a/unit_test/test_spdm_sample/CMakeLists.txt
+++ b/unit_test/test_spdm_sample/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 add_executable(test_spdm_sample)
diff --git a/unit_test/test_spdm_secured_message/CMakeLists.txt b/unit_test/test_spdm_secured_message/CMakeLists.txt
index 629784b68af..382f6099b8f 100644
--- a/unit_test/test_spdm_secured_message/CMakeLists.txt
+++ b/unit_test/test_spdm_secured_message/CMakeLists.txt
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 cmake_minimum_required(VERSION 3.5)
 
 if(NOT ((TOOLCHAIN STREQUAL "KLEE") OR (TOOLCHAIN STREQUAL "CBMC")))

From b987e8d96d569aaca7df989982e789b2aa8de385 Mon Sep 17 00:00:00 2001
From: Gilg Heike <Heike.Gilg@infineon.com>
Date: Mon, 29 Jul 2024 17:15:59 +0200
Subject: [PATCH 4/7] Add SPDX compliant headers to various files

- scripts
- workflow files
- git files
- version files
- config files

Signed-off-by: Gilg Heike <Heike.Gilg@infineon.com>
---
 .github/workflows/build.yml                  | 4 ++++
 .github/workflows/cifuzz.yml                 | 4 ++++
 .github/workflows/code_coverage.yml          | 4 ++++
 .github/workflows/codeql-analysis.yml        | 5 +++++
 .github/workflows/compliance-checks.yml      | 4 ++++
 .gitignore                                   | 6 +++++-
 .gitmodules                                  | 4 ++++
 .uncrustify.cfg                              | 4 ++++
 libspdm.pc.in                                | 4 ++++
 os_stub/mbedtlslib/version.txt               | 4 ++++
 os_stub/openssllib/process_files.pl          | 4 ++++
 os_stub/openssllib/version.txt               | 4 ++++
 script/check_copyright_date.sh               | 4 ++++
 script/check_encode.sh                       | 4 ++++
 script/format_nix.sh                         | 4 ++++
 unit_test/cmockalib/version.txt              | 4 ++++
 unit_test/fuzzing/fuzzing_AFL.sh             | 4 ++++
 unit_test/fuzzing/fuzzing_AFLTurbo.sh        | 4 ++++
 unit_test/fuzzing/fuzzing_AFLplusplus.sh     | 4 ++++
 unit_test/fuzzing/fuzzing_LibFuzzer.sh       | 4 ++++
 unit_test/fuzzing/oss-fuzz_conf/project.yaml | 4 ++++
 unit_test/fuzzing/oss_fuzz.sh                | 4 ++++
 unit_test/fuzzing/run_initial_seed.sh        | 4 ++++
 23 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3bf764af36a..c8749255497 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 name: Build and Test
 
 on:
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 583e2e93096..1d9c0e9cbe5 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 name: CIFuzz
 on:
   pull_request:
diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
index fd8480630b0..8983bef6712 100644
--- a/.github/workflows/code_coverage.yml
+++ b/.github/workflows/code_coverage.yml
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 name: Code Coverage
 
 on:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 30ab838c5d2..265db448e30 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+
 # For most projects, this workflow file will not need changing; you simply need
 # to commit it to your repository.
 #
diff --git a/.github/workflows/compliance-checks.yml b/.github/workflows/compliance-checks.yml
index 2a979f42eae..f49c1029869 100644
--- a/.github/workflows/compliance-checks.yml
+++ b/.github/workflows/compliance-checks.yml
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 name: Compliance Checks
 
 on:
diff --git a/.gitignore b/.gitignore
index 7ca74d48471..ada8e1f581d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
-build
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+build
 .vscode/settings.json
diff --git a/.gitmodules b/.gitmodules
index 50956aca978..0cf6bb5acfa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 [submodule "os_stub/openssllib/openssl"]
     path = os_stub/openssllib/openssl
     url = https://github.com/openssl/openssl
diff --git a/.uncrustify.cfg b/.uncrustify.cfg
index 3bb1f2b756b..ecab7af7fa5 100644
--- a/.uncrustify.cfg
+++ b/.uncrustify.cfg
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 # Uncrustify-0.69.0_f
 
 #
diff --git a/libspdm.pc.in b/libspdm.pc.in
index a14f0adb878..4c9b2d100bc 100644
--- a/libspdm.pc.in
+++ b/libspdm.pc.in
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
 libdir=${exec_prefix}/lib
diff --git a/os_stub/mbedtlslib/version.txt b/os_stub/mbedtlslib/version.txt
index 4808b3d8d1f..94a39e3f4b3 100644
--- a/os_stub/mbedtlslib/version.txt
+++ b/os_stub/mbedtlslib/version.txt
@@ -1 +1,5 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 3.6.0
diff --git a/os_stub/openssllib/process_files.pl b/os_stub/openssllib/process_files.pl
index 579d4e65a0f..a94b896c495 100644
--- a/os_stub/openssllib/process_files.pl
+++ b/os_stub/openssllib/process_files.pl
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/usr/bin/perl -w
 #
 # This script runs the OpenSSL Configure script, then processes the
diff --git a/os_stub/openssllib/version.txt b/os_stub/openssllib/version.txt
index 0783e3a402a..e48712afb36 100644
--- a/os_stub/openssllib/version.txt
+++ b/os_stub/openssllib/version.txt
@@ -1 +1,5 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 openssl-3.0.9
\ No newline at end of file
diff --git a/script/check_copyright_date.sh b/script/check_copyright_date.sh
index 656c6ee7812..4f51a94169d 100755
--- a/script/check_copyright_date.sh
+++ b/script/check_copyright_date.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # Check if the modified files' copyright dates are current.
diff --git a/script/check_encode.sh b/script/check_encode.sh
index 04b92b79dfe..2caa662cfda 100755
--- a/script/check_encode.sh
+++ b/script/check_encode.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # Checks if source code files (.h, .c) are encoded as ASCII and
diff --git a/script/format_nix.sh b/script/format_nix.sh
index 1b7e20099c3..8f0aed5b8da 100755
--- a/script/format_nix.sh
+++ b/script/format_nix.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # Executes the Uncrustify code beautifier.
diff --git a/unit_test/cmockalib/version.txt b/unit_test/cmockalib/version.txt
index a5ba9325118..b108a7a2c76 100644
--- a/unit_test/cmockalib/version.txt
+++ b/unit_test/cmockalib/version.txt
@@ -1 +1,5 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 1.1.7
\ No newline at end of file
diff --git a/unit_test/fuzzing/fuzzing_AFL.sh b/unit_test/fuzzing/fuzzing_AFL.sh
index 8eaa54c082a..b7e9f9c813f 100755
--- a/unit_test/fuzzing/fuzzing_AFL.sh
+++ b/unit_test/fuzzing/fuzzing_AFL.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # Before run this script, please Download and install AFL. Unzip and follow docs\QuickStartGuide.txt. Build it with make.
diff --git a/unit_test/fuzzing/fuzzing_AFLTurbo.sh b/unit_test/fuzzing/fuzzing_AFLTurbo.sh
index a3ce8bde364..815fe5248dd 100755
--- a/unit_test/fuzzing/fuzzing_AFLTurbo.sh
+++ b/unit_test/fuzzing/fuzzing_AFLTurbo.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # Before run this script, please Download and install AFLTurbo. Unzip and follow docs\QuickStartGuide.txt. Build it with make.
diff --git a/unit_test/fuzzing/fuzzing_AFLplusplus.sh b/unit_test/fuzzing/fuzzing_AFLplusplus.sh
index f954eabf036..ae72015d448 100644
--- a/unit_test/fuzzing/fuzzing_AFLplusplus.sh
+++ b/unit_test/fuzzing/fuzzing_AFLplusplus.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # Before run this script, please Download and install AFLplusplus. Unzip and follow docs\QuickStartGuide.txt. Build it with make.
diff --git a/unit_test/fuzzing/fuzzing_LibFuzzer.sh b/unit_test/fuzzing/fuzzing_LibFuzzer.sh
index a48e82742c5..78a67b3f55e 100755
--- a/unit_test/fuzzing/fuzzing_LibFuzzer.sh
+++ b/unit_test/fuzzing/fuzzing_LibFuzzer.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # Before run this script, please install LLVM with: sudo apt install llvm, and install CLANG with: sudo apt install clang.
diff --git a/unit_test/fuzzing/oss-fuzz_conf/project.yaml b/unit_test/fuzzing/oss-fuzz_conf/project.yaml
index 4db5da75ff7..06ff8bb26a3 100644
--- a/unit_test/fuzzing/oss-fuzz_conf/project.yaml
+++ b/unit_test/fuzzing/oss-fuzz_conf/project.yaml
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 homepage: "https://github.com/DMTF/libspdm"
 language: c
 primary_contact: "<primary_contact_email>"
diff --git a/unit_test/fuzzing/oss_fuzz.sh b/unit_test/fuzzing/oss_fuzz.sh
index b93264cf3d2..61833f79d08 100755
--- a/unit_test/fuzzing/oss_fuzz.sh
+++ b/unit_test/fuzzing/oss_fuzz.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # If command 'screen' not found, please install with: sudo apt install screen.
diff --git a/unit_test/fuzzing/run_initial_seed.sh b/unit_test/fuzzing/run_initial_seed.sh
index 9f3926414a6..c868ff9fc3a 100755
--- a/unit_test/fuzzing/run_initial_seed.sh
+++ b/unit_test/fuzzing/run_initial_seed.sh
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
 #!/bin/bash
 
 # this script will run one program one time, with a known good seed, to ensure it can pass the flow without any exception.

From 2de49a68ac8cb763cee8f46e3c5c00b2b752c6b0 Mon Sep 17 00:00:00 2001
From: Gilg Heike <Heike.Gilg@infineon.com>
Date: Mon, 29 Jul 2024 18:34:10 +0200
Subject: [PATCH 5/7] Add license files for all occuring licenses

- Source of license text files: https://github.com/spdx/license-list-data/tree/main/text

Signed-off-by: Gilg Heike <Heike.Gilg@infineon.com>
---
 LICENSE.md                    |  29 ---------
 LICENSES/Apache-2.0.txt       |  73 +++++++++++++++++++++
 LICENSES/BSD-3-Clause.txt     |  11 ++++
 LICENSES/GPL-2.0-or-later.txt | 117 ++++++++++++++++++++++++++++++++++
 LICENSES/LLVM-exception.txt   |  15 +++++
 5 files changed, 216 insertions(+), 29 deletions(-)
 delete mode 100644 LICENSE.md
 create mode 100644 LICENSES/Apache-2.0.txt
 create mode 100644 LICENSES/BSD-3-Clause.txt
 create mode 100644 LICENSES/GPL-2.0-or-later.txt
 create mode 100644 LICENSES/LLVM-exception.txt

diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index d7c1b7b5b3c..00000000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2021-2024, Contributing Member(s) of Distributed Management Task Force,
-Inc.. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt
new file mode 100644
index 00000000000..137069b8238
--- /dev/null
+++ b/LICENSES/Apache-2.0.txt
@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt
new file mode 100644
index 00000000000..fabff60475f
--- /dev/null
+++ b/LICENSES/BSD-3-Clause.txt
@@ -0,0 +1,11 @@
+Copyright (c) 2021-2024 Contributing Member(s) of DMTF.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt
new file mode 100644
index 00000000000..17cb286430a
--- /dev/null
+++ b/LICENSES/GPL-2.0-or-later.txt
@@ -0,0 +1,117 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+     a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+     b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+     c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+     a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+     one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author
+
+     This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+     Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+     Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice
diff --git a/LICENSES/LLVM-exception.txt b/LICENSES/LLVM-exception.txt
new file mode 100644
index 00000000000..fa4b725a0ee
--- /dev/null
+++ b/LICENSES/LLVM-exception.txt
@@ -0,0 +1,15 @@
+---- LLVM Exceptions to the Apache 2.0 License ----
+
+   As an exception, if, as a result of your compiling your source code, portions
+   of this Software are embedded into an Object form of such source code, you
+   may redistribute such embedded portions in such Object form without complying
+   with the conditions of Sections 4(a), 4(b) and 4(d) of the License.
+
+   In addition, if you combine or link compiled forms of this Software with
+   software that is licensed under the GPLv2 ("Combined Software") and if a
+   court of competent jurisdiction determines that the patent provision (Section
+   3), the indemnity provision (Section 9) or other Section of the License
+   conflicts with the conditions of the GPLv2, you may retroactively and
+   prospectively choose to deem waived or otherwise exclude such Section(s) of
+   the License, but only in their entirety and only with respect to the Combined
+   Software.

From eb0a8fc944429e5ce2529e68f15cc5fd28240066 Mon Sep 17 00:00:00 2001
From: Gilg Heike <Heike.Gilg@infineon.com>
Date: Mon, 29 Jul 2024 18:36:54 +0200
Subject: [PATCH 6/7] Add support for REUSE

- REUSE can be used to verify license/copyright headers
- REUSE makes licenses/copyrights machine-radable
- Install REUSE via:
```bash
python3 -m pip install reuse # Install reuse
reuse lint # Validate copyright and license information
```
- With REUSE.toml files that cannot easily get a license/copyright headers (e.g. auto generated files) get also the license/copyright information for REUSE
- More information about REUSE: https://reuse.software/

Signed-off-by: Gilg Heike <Heike.Gilg@infineon.com>
---
 REUSE.toml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 REUSE.toml

diff --git a/REUSE.toml b/REUSE.toml
new file mode 100644
index 00000000000..ac8f79435a2
--- /dev/null
+++ b/REUSE.toml
@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: 2021-2024 DMTF
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+version = 1
+
+# Bulk add license and copyright for markdown files, key files and seeds.
+[[annotations]]
+path = [
+    "doc/**",
+    "**README.md",
+    "SECURITY.md",
+    "VERSION.md",
+    "unit_test/sample_key/**",
+    "unit_test/fuzzing/seeds/**"
+]
+SPDX-FileCopyrightText = "2021-2024 DMTF"
+SPDX-License-Identifier = "BSD-3-Clause"
+
+# Bulk add original license for auto generated files
+[[annotations]]
+path = ["os_stub/openssllib/openssl_gen/**"]
+SPDX-License-Identifier = "Apache-2.0"

From a9f0698cc127ea7c872eb33b0c433f9174801c67 Mon Sep 17 00:00:00 2001
From: Gilg Heike <Heike.Gilg@infineon.com>
Date: Tue, 30 Jul 2024 08:15:53 +0200
Subject: [PATCH 7/7] Update check_copyright_date for SPDX format header

- Copyright date is now in the second line of each file

Signed-off-by: Gilg Heike <Heike.Gilg@infineon.com>
---
 script/check_copyright_date.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/check_copyright_date.sh b/script/check_copyright_date.sh
index 4f51a94169d..66144e57e0b 100755
--- a/script/check_copyright_date.sh
+++ b/script/check_copyright_date.sh
@@ -27,7 +27,7 @@ do
     if [[ $file == "include/"* ]] || [[ $file == "library/"* ]]; then
         if [[ $file == *".h" ]] || [[ $file == *".c" ]]; then
             # Assume that the copyright is located at the third line of the file.
-            if [[ $(sed -n '3p' $file) != *$current_year* ]]; then
+            if [[ $(sed -n '2p' $file) != *$current_year* ]]; then
                 echo $file needs to be updated with $current_year copyright.
                 exit_code=1
             fi