espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-12-15 01:48:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Update mbedtls to 1d34215a which is behind mbedtls-3.6.3 on branch mbedtls-3.6.3-idf

Browse Source
This commit is contained in:
Xu Chun Guang
2025-04-15 17:04:53 +08:00
parent 2cfa9d40c2
commit 0f71f1c583
154 changed files with 30305 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/openssl/Kconfig
View File

@@ -1,5 +1,5 @@
menu "OpenSSL"
menu "OpenSSL (Not Support mbedtls V3.x)"
depends on !MBEDTLS_V3
config OPENSSL_DEBUG
bool "Enable OpenSSL debugging"
default n

26
components/openssl/platform/ssl_pm.c
View File

@@ -26,6 +26,12 @@
#include "mbedtls/certs.h"
#define X509_INFO_STRING_LENGTH 8192
#if defined(CONFIG_MBEDTLS_V3)
// Only for compliation, not work
#define MBEDTLS_SSL_MINOR_VERSION_0 0 /*!< SSL v3.0 */
#define MBEDTLS_SSL_MINOR_VERSION_1 1 /*!< TLS v1.0 */
#define MBEDTLS_SSL_MINOR_VERSION_2 2 /*!< TLS v1.1 */
#endif
struct ssl_pm
{
@@ -261,7 +267,7 @@ static int mbedtls_handshake( mbedtls_ssl_context *ssl )
{
int ret = 0;
while (ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER) {
while (ssl->MBEDTLS_PRIVATE(state) != MBEDTLS_SSL_HANDSHAKE_OVER) {
ret = mbedtls_ssl_handshake_step(ssl);
SSL_DEBUG(SSL_PLATFORM_DEBUG_LEVEL, "ssl ret %d state %d", ret, ssl->state);
@@ -391,7 +397,7 @@ OSSL_HANDSHAKE_STATE ssl_pm_get_state(const SSL *ssl)
struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm;
switch (ssl_pm->ssl.state)
switch (ssl_pm->ssl.MBEDTLS_PRIVATE(state))
{
case MBEDTLS_SSL_CLIENT_HELLO:
state = TLS_ST_CW_CLNT_HELLO;
@@ -426,9 +432,11 @@ OSSL_HANDSHAKE_STATE ssl_pm_get_state(const SSL *ssl)
case MBEDTLS_SSL_SERVER_KEY_EXCHANGE:
state = TLS_ST_SR_KEY_EXCH;
break;
#if !defined(CONFIG_MBEDTLS_V3)
case MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET:
state = TLS_ST_SW_SESSION_TICKET;
break;
#endif
case MBEDTLS_SSL_SERVER_HELLO_VERIFY_REQUEST_SENT:
state = TLS_ST_SW_CERT_REQ;
break;
@@ -605,6 +613,14 @@ void pkey_pm_free(EVP_PKEY *pk)
pk->pkey_pm = NULL;
}
#if defined(CONFIG_MBEDTLS_V3)
static int mbedtls_ctr_drbg_random_fake(void *p_rng, unsigned char *output,
size_t output_len)
{
return 0;
}
#endif
int pkey_pm_load(EVP_PKEY *pk, const unsigned char *buffer, int len)
{
int ret;
@@ -632,8 +648,12 @@ int pkey_pm_load(EVP_PKEY *pk, const unsigned char *buffer, int len)
load_buf[len] = '\0';
mbedtls_pk_init(pkey_pm->pkey);
#if defined(CONFIG_MBEDTLS_V3)
ret = mbedtls_pk_parse_key(pkey_pm->pkey, load_buf, len + 1, NULL, 0,
mbedtls_ctr_drbg_random_fake, NULL);
#else
ret = mbedtls_pk_parse_key(pkey_pm->pkey, load_buf, len + 1, NULL, 0);
#endif
ssl_mem_free(load_buf);
if (ret) {