diff --git a/spdm-emu b/spdm-emu
index acd4a1d..74b155b 160000
--- a/spdm-emu
+++ b/spdm-emu
@@ -1 +1 @@
-Subproject commit acd4a1de517664bdf30a9bc2e645e28d0ca66b91
+Subproject commit 74b155b4989de5ef8d3869a68acb384ef651c661
diff --git a/teeio-validator/CMakeLists.txt b/teeio-validator/CMakeLists.txt
index 4c237b9..2847d00 100644
--- a/teeio-validator/CMakeLists.txt
+++ b/teeio-validator/CMakeLists.txt
@@ -15,6 +15,7 @@ SET(CMAKE_BUILD_TYPE ${TARGET} CACHE STRING "Choose the target of build: Debug R
 SET(CRYPTO ${CRYPTO} CACHE STRING "Choose the crypto of build: mbedtls openssl" FORCE)
 SET(GCOV ${GCOV} CACHE STRING "Choose the target of Gcov: ON  OFF, and default is OFF" FORCE)
 SET(STACK_USAGE ${STACK_USAGE} CACHE STRING "Choose the target of STACK_USAGE: ON  OFF, and default is OFF" FORCE)
+set(X509_IGNORE_CRITICAL ${X509_IGNORE_CRITICAL} CACHE STRING "Choose if libspdm-provided cryptography libraries (OpenSSL and MbedTLS) ignore unsupported critical extensions in certificates : ON OFF, and default is OFF" FORCE)
 
 if(NOT GCOV)
     SET(GCOV "OFF")
@@ -24,6 +25,10 @@ if(NOT STACK_USAGE)
     SET(STACK_USAGE "OFF")
 endif()
 
+if(NOT X509_IGNORE_CRITICAL)
+    set(X509_IGNORE_CRITICAL "OFF")
+endif()
+
 SET(LIBSPDM_DIR ${PROJECT_SOURCE_DIR}/../spdm-emu/libspdm)
 SET(SPDM_EMU_DIR ${PROJECT_SOURCE_DIR}/../spdm-emu)
 SET(TEEIO_VALIDATOR_DIR ${PROJECT_SOURCE_DIR}/teeio_validator)
@@ -84,6 +89,14 @@ else()
     MESSAGE(FATAL_ERROR "Unkown CRYPTO")
 endif()
 
+if (X509_IGNORE_CRITICAL STREQUAL "ON")
+    if (CRYPTO STREQUAL "openssl")
+        add_definitions(-DOPENSSL_IGNORE_CRITICAL=1)
+    elseif(CRYPTO STREQUAL "mbedtls")
+        add_definitions(-DLIBSPDM_MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION)
+    endif()
+endif()
+
 if(ENABLE_BINARY_BUILD STREQUAL "1")
     if(NOT CRYPTO STREQUAL "openssl")
         MESSAGE(FATAL_ERROR "enabling binary build not supported for non-openssl")
diff --git a/teeio-validator/library/spdmlib/spdm.c b/teeio-validator/library/spdmlib/spdm.c
index 8e02e09..a2b3c51 100644
--- a/teeio-validator/library/spdmlib/spdm.c
+++ b/teeio-validator/library/spdmlib/spdm.c
@@ -136,7 +136,7 @@ void *spdm_client_init(void)
     data16 = 0;
     libspdm_set_data(spdm_context, LIBSPDM_DATA_REQ_BASE_ASYM_ALG, &parameter,
                      &data16, sizeof(data16));
-    data16 = SPDM_ALGORITHMS_KEY_SCHEDULE_HMAC_HASH;
+    data16 = SPDM_ALGORITHMS_KEY_SCHEDULE_SPDM;
     libspdm_set_data(spdm_context, LIBSPDM_DATA_KEY_SCHEDULE, &parameter, &data16,
                      sizeof(data16));
     data8 = SPDM_ALGORITHMS_OPAQUE_DATA_FORMAT_1;