Pass request Context field to Integrator

Fix #3308.

Signed-off-by: Steven Bellock <[email protected]>

Author: steven-bellock

include/hal/library/requester/reqasymsignlib.h

@@ -48,7 +48,10 @@ extern bool libspdm_requester_data_sign(
  * @param  spdm_context  A pointer to the SPDM context.
  * @param  spdm_version  Indicates the negotiated version.
  *
- * @param  slot_id       The number of slot for the certificate chain.
+ * @param  slot_id               The number of slot for the certificate chain.
+ * @param  request_context_size  The size, in bytes, of request_context.
+ * @param  request_context       If spdm_version is greater than 1.2, then it is a pointer to the
+ *                               Context field in the request message, else it is NULL and ignored.
  *
  * @param  measurement_summary_hash        The measurement summary hash.
  * @param  measurement_summary_hash_size   The size of measurement summary hash.
@@ -65,6 +68,8 @@ extern bool libspdm_encap_challenge_opaque_data(
     void *spdm_context,
     spdm_version_number_t spdm_version,
     uint8_t slot_id,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *measurement_summary_hash,
     size_t measurement_summary_hash_size,
     void *opaque_data,

include/hal/library/responder/asymsignlib.h

@@ -19,7 +19,10 @@
  * @param  spdm_context  A pointer to the SPDM context.
  * @param  spdm_version  Indicates the negotiated version.
  *
- * @param  slot_id       The number of slot for the certificate chain.
+ * @param  slot_id          The number of slot for the certificate chain.
+ * @param  request_context_size  The size, in bytes, of request_context.
+ * @param  request_context       If spdm_version is greater than 1.2, then it is a pointer to the
+ *                               Context field in the request message, else it is NULL and ignore
  *
  * @param  measurement_summary_hash        The measurement summary hash.
  * @param  measurement_summary_hash_size   The size of measurement summary hash.
@@ -36,6 +39,8 @@ extern bool libspdm_challenge_opaque_data(
     void *spdm_context,
     spdm_version_number_t spdm_version,
     uint8_t slot_id,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *measurement_summary_hash,
     size_t measurement_summary_hash_size,
     void *opaque_data,

include/hal/library/responder/measlib.h

@@ -45,6 +45,10 @@
  *
  * @param request_attribute A bitmask who fields are SPDM_GET_MEASUREMENTS_REQUEST_ATTRIBUTES_*.
  *
+ * @param  request_context_size  The size, in bytes, of request_context.
+ * @param  request_context       If spdm_version is greater than 1.2, then it is a pointer to the
+ *                               Context field in the request message, else it is NULL and ignore
+ *
  * @param  measurements_count
  * When "measurement_index" is zero, returns the total count of
  * measurements available for the device. None of the actual measurements are
@@ -72,6 +76,8 @@ extern libspdm_return_t libspdm_measurement_collection(
     uint32_t measurement_hash_algo,
     uint8_t measurement_index,
     uint8_t request_attribute,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *content_changed,
     uint8_t *measurements_count,
     void *measurements,
@@ -96,6 +102,10 @@ extern libspdm_return_t libspdm_measurement_collection(
  *
  * @param request_attribute A bitmask who fields are SPDM_GET_MEASUREMENTS_REQUEST_ATTRIBUTES_*.
  *
+ * @param  request_context_size  The size, in bytes, of request_context.
+ * @param  request_context       If spdm_version is greater than 1.2, then it is a pointer to the
+ *                               Context field in the request message, else it is NULL and ignore
+ *
  * @param opaque_data
  * A pointer to a destination buffer whose size, in bytes, is opaque_data_size. The opaque data is
  * copied to this buffer.
@@ -111,6 +121,8 @@ extern bool libspdm_measurement_opaque_data(
     uint32_t measurement_hash_algo,
     uint8_t measurement_index,
     uint8_t request_attribute,
+    size_t request_context_size,
+    const void *request_context,
     void *opaque_data,
     size_t *opaque_data_size);
 

library/spdm_requester_lib/libspdm_req_encap_challenge_auth.c

@@ -26,6 +26,8 @@ libspdm_return_t libspdm_get_encap_response_challenge_auth(
     uint8_t auth_attribute;
     libspdm_return_t status;
     uint8_t slot_mask;
+    size_t request_context_size;
+    const void *request_context;
     uint8_t *opaque_data;
     size_t opaque_data_size;
     size_t spdm_request_size;
@@ -114,6 +116,14 @@ libspdm_return_t libspdm_get_encap_response_challenge_auth(
                    SPDM_NONCE_SIZE + measurement_summary_hash_size + sizeof(uint16_t) +
                    SPDM_REQ_CONTEXT_SIZE + signature_size);
 
+    if (spdm_request->header.spdm_version >= SPDM_MESSAGE_VERSION_13) {
+        request_context_size = SPDM_REQ_CONTEXT_SIZE;
+        request_context = spdm_request + 1;
+    } else {
+        request_context_size = 0;
+        request_context = NULL;
+    }
+
     libspdm_zero_mem(response, *response_size);
     spdm_response = response;
 
@@ -167,6 +177,8 @@ libspdm_return_t libspdm_get_encap_response_challenge_auth(
         spdm_context,
         context->connection_info.version,
         slot_id,
+        request_context_size,
+        request_context,
         measurement_summary_hash, measurement_summary_hash_size,
         opaque_data, &opaque_data_size);
     if (!result) {

library/spdm_responder_lib/libspdm_rsp_challenge_auth.c

@@ -30,6 +30,8 @@ libspdm_return_t libspdm_get_response_challenge_auth(libspdm_context_t *spdm_con
     uint8_t slot_mask;
     uint8_t *opaque_data;
     size_t opaque_data_size;
+    size_t request_context_size;
+    const void *request_context;
     size_t spdm_response_size;
 
     spdm_request = request;
@@ -141,6 +143,14 @@ libspdm_return_t libspdm_get_response_challenge_auth(libspdm_context_t *spdm_con
                                                0, response_size, response);
     }
 
+    if (spdm_request->header.spdm_version >= SPDM_MESSAGE_VERSION_13) {
+        request_context_size = SPDM_REQ_CONTEXT_SIZE;
+        request_context = spdm_request + 1;
+    } else {
+        request_context_size = 0;
+        request_context = NULL;
+    }
+
     /* response_size should be large enough to hold a challenge response without opaque data. */
     LIBSPDM_ASSERT(*response_size >= sizeof(spdm_challenge_auth_response_t) + hash_size +
                    SPDM_NONCE_SIZE + measurement_summary_hash_size + sizeof(uint16_t) +
@@ -265,6 +275,8 @@ libspdm_return_t libspdm_get_response_challenge_auth(libspdm_context_t *spdm_con
             spdm_context,
             spdm_context->connection_info.version,
             slot_id,
+            request_context_size,
+            request_context,
             measurement_summary_hash, measurement_summary_hash_size,
             opaque_data, &opaque_data_size);
         if (!result) {

library/spdm_responder_lib/libspdm_rsp_measurements.c

@@ -87,6 +87,8 @@ libspdm_return_t libspdm_get_response_measurements(libspdm_context_t *spdm_conte
     libspdm_session_state_t session_state;
     uint8_t content_changed;
     uint8_t *fill_response_ptr;
+    size_t request_context_size;
+    const void *request_context;
 
     spdm_request = request;
 
@@ -229,6 +231,19 @@ libspdm_return_t libspdm_get_response_measurements(libspdm_context_t *spdm_conte
         }
     }
 
+    if (spdm_request->header.spdm_version >= SPDM_MESSAGE_VERSION_13) {
+        request_context_size = SPDM_REQ_CONTEXT_SIZE;
+
+        if ((spdm_request->header.param1 &
+             SPDM_GET_MEASUREMENTS_REQUEST_ATTRIBUTES_GENERATE_SIGNATURE) == 0) {
+            request_context = (const uint8_t *)spdm_request + sizeof(spdm_message_header_t);
+        } else {
+            request_context = spdm_request + 1;
+        }
+    } else {
+        request_context_size = 0;
+        request_context = NULL;
+    }
 
     /* response_size should be large enough to hold a MEASUREMENTS response without
      * measurements or opaque data. */
@@ -253,6 +268,8 @@ libspdm_return_t libspdm_get_response_measurements(libspdm_context_t *spdm_conte
         spdm_context->connection_info.algorithm.measurement_hash_algo,
         measurements_index,
         spdm_request->header.param1,
+        request_context_size,
+        request_context,
         &content_changed,
         &measurements_count,
         measurements,
@@ -299,6 +316,8 @@ libspdm_return_t libspdm_get_response_measurements(libspdm_context_t *spdm_conte
             spdm_context->connection_info.algorithm.measurement_hash_algo,
             measurements_index,
             spdm_request->header.param1,
+            request_context_size,
+            request_context,
             opaque_data,
             &opaque_data_size);
 

os_stub/spdm_device_secret_lib_null/lib.c

@@ -26,6 +26,8 @@ libspdm_return_t libspdm_measurement_collection(
     uint32_t measurement_hash_algo,
     uint8_t measurements_index,
     uint8_t request_attribute,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *content_changed,
     uint8_t *device_measurement_count,
     void *device_measurement,
@@ -41,6 +43,8 @@ bool libspdm_measurement_opaque_data(
     uint32_t measurement_hash_algo,
     uint8_t measurement_index,
     uint8_t request_attribute,
+    size_t request_context_size,
+    const void *request_context,
     void *opaque_data,
     size_t *opaque_data_size)
 {
@@ -66,6 +70,8 @@ bool libspdm_challenge_opaque_data(
     void *spdm_context,
     spdm_version_number_t spdm_version,
     uint8_t slot_id,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *measurement_summary_hash,
     size_t measurement_summary_hash_size,
     void *opaque_data,
@@ -80,6 +86,8 @@ bool libspdm_encap_challenge_opaque_data(
     void *spdm_context,
     spdm_version_number_t spdm_version,
     uint8_t slot_id,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *measurement_summary_hash,
     size_t measurement_summary_hash_size,
     void *opaque_data,

os_stub/spdm_device_secret_lib_sample/chal.c

@@ -1,6 +1,6 @@
 /**
  *  Copyright Notice:
- *  Copyright 2024 DMTF. All rights reserved.
+ *  Copyright 2024-2025 DMTF. All rights reserved.
  *  License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/libspdm/blob/main/LICENSE.md
  **/
 
@@ -20,11 +20,15 @@
 
 #if LIBSPDM_ENABLE_CAPABILITY_CHAL_CAP
 size_t libspdm_secret_lib_challenge_opaque_data_size;
+bool g_check_challenge_request_context = false;
+uint64_t g_challenge_request_context;
 
 bool libspdm_challenge_opaque_data(
     void *spdm_context,
     spdm_version_number_t spdm_version,
     uint8_t slot_id,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *measurement_summary_hash,
     size_t measurement_summary_hash_size,
     void *opaque_data,
@@ -34,6 +38,16 @@ bool libspdm_challenge_opaque_data(
 
     LIBSPDM_ASSERT(libspdm_secret_lib_challenge_opaque_data_size <= *opaque_data_size);
 
+    if (g_check_challenge_request_context) {
+        if ((spdm_version >> SPDM_VERSION_NUMBER_SHIFT_BIT) >= SPDM_MESSAGE_VERSION_13) {
+            LIBSPDM_ASSERT(request_context_size == SPDM_REQ_CONTEXT_SIZE);
+            LIBSPDM_ASSERT(libspdm_read_uint64(request_context) == g_challenge_request_context);
+        } else {
+            LIBSPDM_ASSERT(request_context_size == 0);
+            LIBSPDM_ASSERT(request_context == NULL);
+        }
+    }
+
     *opaque_data_size = libspdm_secret_lib_challenge_opaque_data_size;
 
     for (index = 0; index < *opaque_data_size; index++)
@@ -43,13 +57,13 @@ bool libspdm_challenge_opaque_data(
 
     return true;
 }
-#endif /* LIBSPDM_ENABLE_CAPABILITY_CHAL_CAP */
 
-#if LIBSPDM_ENABLE_CAPABILITY_CHAL_CAP
 bool libspdm_encap_challenge_opaque_data(
     void *spdm_context,
     spdm_version_number_t spdm_version,
     uint8_t slot_id,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *measurement_summary_hash,
     size_t measurement_summary_hash_size,
     void *opaque_data,
@@ -59,6 +73,16 @@ bool libspdm_encap_challenge_opaque_data(
 
     LIBSPDM_ASSERT(libspdm_secret_lib_challenge_opaque_data_size <= *opaque_data_size);
 
+    if (g_check_challenge_request_context) {
+        if ((spdm_version >> SPDM_VERSION_NUMBER_SHIFT_BIT) >= SPDM_MESSAGE_VERSION_13) {
+            LIBSPDM_ASSERT(request_context_size == SPDM_REQ_CONTEXT_SIZE);
+            LIBSPDM_ASSERT(libspdm_read_uint64(request_context) == g_challenge_request_context);
+        } else {
+            LIBSPDM_ASSERT(request_context_size == 0);
+            LIBSPDM_ASSERT(request_context == NULL);
+        }
+    }
+
     *opaque_data_size = libspdm_secret_lib_challenge_opaque_data_size;
 
     for (index = 0; index < *opaque_data_size; index++)

os_stub/spdm_device_secret_lib_sample/meas.c

@@ -377,13 +377,18 @@ size_t libspdm_fill_measurement_device_mode_block (
     return sizeof(spdm_measurement_block_dmtf_t) + sizeof(device_mode);
 }
 
+bool g_check_measurement_request_context = false;
+uint64_t g_measurement_request_context;
+
 libspdm_return_t libspdm_measurement_collection(
     void *spdm_context,
     spdm_version_number_t spdm_version,
     uint8_t measurement_specification,
     uint32_t measurement_hash_algo,
     uint8_t measurements_index,
     uint8_t request_attribute,
+    size_t request_context_size,
+    const void *request_context,
     uint8_t *content_changed,
     uint8_t *measurements_count,
     void *measurements,
@@ -396,12 +401,21 @@ libspdm_return_t libspdm_measurement_collection(
     bool use_bit_stream;
     size_t measurement_block_size;
 
-    if ((measurement_specification !=
-         SPDM_MEASUREMENT_SPECIFICATION_DMTF) ||
+    if ((measurement_specification != SPDM_MEASUREMENT_SPECIFICATION_DMTF) ||
         (measurement_hash_algo == 0)) {
         return LIBSPDM_STATUS_UNSUPPORTED_CAP;
     }
 
+    if (g_check_measurement_request_context) {
+        if ((spdm_version >> SPDM_VERSION_NUMBER_SHIFT_BIT) >= SPDM_MESSAGE_VERSION_13) {
+            LIBSPDM_ASSERT(request_context_size == SPDM_REQ_CONTEXT_SIZE);
+            LIBSPDM_ASSERT(libspdm_read_uint64(request_context) == g_measurement_request_context);
+        } else {
+            LIBSPDM_ASSERT(request_context_size == 0);
+            LIBSPDM_ASSERT(request_context == NULL);
+        }
+    }
+
     hash_size = libspdm_get_measurement_hash_size(measurement_hash_algo);
     LIBSPDM_ASSERT(hash_size != 0);
 
@@ -615,13 +629,25 @@ bool libspdm_measurement_opaque_data(
     uint32_t measurement_hash_algo,
     uint8_t measurement_index,
     uint8_t request_attribute,
+    size_t request_context_size,
+    const void *request_context,
     void *opaque_data,
     size_t *opaque_data_size)
 {
     size_t index;
 
     LIBSPDM_ASSERT(libspdm_secret_lib_meas_opaque_data_size <= *opaque_data_size);
 
+    if (g_check_measurement_request_context) {
+        if ((spdm_version >> SPDM_VERSION_NUMBER_SHIFT_BIT) >= SPDM_MESSAGE_VERSION_13) {
+            LIBSPDM_ASSERT(request_context_size == SPDM_REQ_CONTEXT_SIZE);
+            LIBSPDM_ASSERT(libspdm_read_uint64(request_context) == g_measurement_request_context);
+        } else {
+            LIBSPDM_ASSERT(request_context_size == 0);
+            LIBSPDM_ASSERT(request_context == NULL);
+        }
+    }
+
     *opaque_data_size = libspdm_secret_lib_meas_opaque_data_size;
 
     for (index = 0; index < *opaque_data_size; index++)
@@ -669,6 +695,8 @@ bool libspdm_generate_measurement_summary_hash(
             measurement_hash_algo,
             0xFF, /* Get all measurements*/
             0,
+            0,
+            NULL,
             NULL,
             &device_measurement_count, device_measurement,
             &device_measurement_size);