fix SPDM 1.3 MEL algorithm negotiate

Signed-off-by: Xiaohanjlll <[email protected]>
DMTF · Jan 24, 2024 · 6866a44 · 6866a44
1 parent 33ed7e3
commit 6866a44
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/library/spdm_requester_lib/libspdm_req_negotiate_algorithms.c b/library/spdm_requester_lib/libspdm_req_negotiate_algorithms.c
@@ -573,12 +573,30 @@ static libspdm_return_t libspdm_try_negotiate_algorithms(libspdm_context_t *spdm
                 if (spdm_response->header.spdm_version >= SPDM_MESSAGE_VERSION_13) {
                     if (libspdm_is_capabilities_flag_supported(
                             spdm_context, true, 0,
-                            SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEL_CAP) &&
-                        (spdm_request->mel_specification != 0)) {
-                        if (spdm_context->connection_info.algorithm.mel_spec !=
-                            SPDM_MEL_SPECIFICATION_DMTF) {
-                            status = LIBSPDM_STATUS_INVALID_MSG_FIELD;
-                            goto receive_done;
+                            SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEL_CAP)){
+                        if(spdm_request->mel_specification != 0){
+                            if (spdm_context->connection_info.algorithm.mel_spec !=
+                                SPDM_MEL_SPECIFICATION_DMTF) {
+                                status = LIBSPDM_STATUS_INVALID_MSG_FIELD;
+                                goto receive_done;
+                            }
+                        } else {
+                            if (spdm_context->connection_info.algorithm.mel_spec != 0) {
+                                status = LIBSPDM_STATUS_INVALID_MSG_FIELD;
+                                goto receive_done;
+                            }
+                        }
+                    } else {
+                        if(spdm_request->mel_specification != 0){
+                            if (spdm_context->connection_info.algorithm.mel_spec != 0) {
+                                status = LIBSPDM_STATUS_INVALID_MSG_FIELD;
+                                goto receive_done;
+                            }
+                        } else {
+                            if (spdm_context->connection_info.algorithm.mel_spec != 0) {
+                                status = LIBSPDM_STATUS_INVALID_MSG_FIELD;
+                                goto receive_done;
+                            }
                         }
                     }
                 }