Merge branch 'bugfix/crt_bundle_no_config_file' into 'master'
esp_crt_bundle: fixes the "No CA Chain is set" error See merge request espressif/esp-idf!8851
This commit is contained in:
commit
a2d7e8cbba
2 changed files with 4 additions and 3 deletions
|
@ -120,7 +120,7 @@ endif()
|
||||||
set_property(TARGET mbedcrypto APPEND PROPERTY LINK_INTERFACE_LIBRARIES mbedtls)
|
set_property(TARGET mbedcrypto APPEND PROPERTY LINK_INTERFACE_LIBRARIES mbedtls)
|
||||||
|
|
||||||
# Link mbedtls libraries to component library
|
# Link mbedtls libraries to component library
|
||||||
target_link_libraries(${COMPONENT_LIB} INTERFACE ${mbedtls_targets})
|
target_link_libraries(${COMPONENT_LIB} PUBLIC ${mbedtls_targets})
|
||||||
|
|
||||||
# Link esp-cryptoauthlib to mbedtls
|
# Link esp-cryptoauthlib to mbedtls
|
||||||
if(CONFIG_ATCA_MBEDTLS_ECDSA)
|
if(CONFIG_ATCA_MBEDTLS_ECDSA)
|
||||||
|
|
|
@ -196,9 +196,10 @@ esp_err_t esp_crt_bundle_attach(void *conf)
|
||||||
* This is only required so that the
|
* This is only required so that the
|
||||||
* cacert_ptr passes non-NULL check during handshake
|
* cacert_ptr passes non-NULL check during handshake
|
||||||
*/
|
*/
|
||||||
|
mbedtls_ssl_config *ssl_conf = (mbedtls_ssl_config *)conf;
|
||||||
mbedtls_x509_crt_init(&s_dummy_crt);
|
mbedtls_x509_crt_init(&s_dummy_crt);
|
||||||
((mbedtls_ssl_config *)conf)->ca_chain = &s_dummy_crt;
|
mbedtls_ssl_conf_ca_chain(ssl_conf, &s_dummy_crt, NULL);
|
||||||
mbedtls_ssl_conf_verify((mbedtls_ssl_config *)conf, esp_crt_verify_callback, NULL);
|
mbedtls_ssl_conf_verify(ssl_conf, esp_crt_verify_callback, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue