coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-07-30 16:26:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix async hardware TLS compatibility with upstream tests

Browse Source 
Signed-off-by: Cal Abel <crabel@mac.com>
This commit is contained in:
Cal Abel 2026-07-03 20:48:07 -04:00
parent 8ed5a11402
commit 3bf4e9df03
6 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/ssl_tls.c
View File

@ -458,18 +458,14 @@ static int ssl_tls12_session_load(mbedtls_ssl_session *session,
static int ssl_update_checksum_start(mbedtls_ssl_context *, const unsigned char *, size_t);
#if defined(PSA_WANT_ALG_SHA_256)
#if defined(PSA_WANT_ALG_SHA_256) && !defined(PSA_WANT_ALG_SHA_512)
static int ssl_update_checksum_sha256(mbedtls_ssl_context *, const unsigned char *, size_t);
#endif /* PSA_WANT_ALG_SHA_256*/
#if defined(PSA_WANT_ALG_SHA_384)
#if defined(PSA_WANT_ALG_SHA_384) && !defined(PSA_WANT_ALG_SHA_512)
static int ssl_update_checksum_sha384(mbedtls_ssl_context *, const unsigned char *, size_t);
#endif /* PSA_WANT_ALG_SHA_384*/
#if defined(PSA_WANT_ALG_SHA_512)
static int ssl_update_checksum_sha512(mbedtls_ssl_context *, const unsigned char *, size_t);
#endif /* PSA_WANT_ALG_SHA_512 */
int mbedtls_ssl_tls_prf(const mbedtls_tls_prf_types prf,
const unsigned char *secret, size_t slen,
const char *label,
@ -923,7 +919,7 @@ static int ssl_update_checksum_start(mbedtls_ssl_context *ssl,
return 0;
}
#if defined(PSA_WANT_ALG_SHA_256)
#if defined(PSA_WANT_ALG_SHA_256) && !defined(PSA_WANT_ALG_SHA_512)
static int ssl_update_checksum_sha256(mbedtls_ssl_context *ssl,
const unsigned char *buf, size_t len)
{
@ -932,7 +928,7 @@ static int ssl_update_checksum_sha256(mbedtls_ssl_context *ssl,
}
#endif
#if defined(PSA_WANT_ALG_SHA_384)
#if defined(PSA_WANT_ALG_SHA_384) && !defined(PSA_WANT_ALG_SHA_512)
static int ssl_update_checksum_sha384(mbedtls_ssl_context *ssl,
const unsigned char *buf, size_t len)
{
@ -941,15 +937,6 @@ static int ssl_update_checksum_sha384(mbedtls_ssl_context *ssl,
}
#endif
#if defined(PSA_WANT_ALG_SHA_512)
static int ssl_update_checksum_sha512(mbedtls_ssl_context *ssl,
const unsigned char *buf, size_t len)
{
return mbedtls_md_error_from_psa(psa_hash_update(
&ssl->handshake->fin_sha512_psa, buf, len));
}
#endif
static void ssl_handshake_params_init(mbedtls_ssl_handshake_params *handshake)
{
memset(handshake, 0, sizeof(mbedtls_ssl_handshake_params));

6
library/ssl_tls12_client.c
View File

@ -3195,6 +3195,12 @@ sign:
return MBEDTLS_ERR_SSL_HANDSHAKE_FAILURE;
}
ret = ssl->handshake->calc_verify(ssl, hash, &hashlen);
if (0 != ret) {
MBEDTLS_SSL_DEBUG_RET(1, ("calc_verify"), ret);
return ret;
}
MBEDTLS_PUT_UINT16_BE(selected_sig_alg, ssl->out_msg, 4);
/* Info from md_alg will be used instead */

2
library/ssl_tls12_server.c
View File

@ -3206,7 +3206,7 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl)
{
int ret = MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
size_t i, sig_len;
unsigned char hash[48];
unsigned char hash[64];
unsigned char *hash_start = hash;
size_t hashlen;
mbedtls_pk_sigalg_t pk_alg;

7
library/ssl_tls13_keys.c
View File

@ -1446,9 +1446,6 @@ static int ssl_tls13_key_schedule_stage_handshake(mbedtls_ssl_context *ssl)
/* Compute ECDH shared secret. */
psa_status_t status = PSA_ERROR_GENERIC_ERROR;
psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
mbedtls_svc_key_id_t shared_secret_key = MBEDTLS_SVC_KEY_ID_INIT;
psa_status_t shared_secret_key_destruction_status =
PSA_ERROR_GENERIC_ERROR;
status = psa_get_key_attributes(handshake->xxdh_psa_privkey,
&key_attributes);
@ -1467,6 +1464,10 @@ static int ssl_tls13_key_schedule_stage_handshake(mbedtls_ssl_context *ssl)
#if defined(MBEDTLS_ASYNC_HARDWARE_ECDH) && \
defined(MBEDTLS_SSL_ECP_RESTARTABLE_ENABLED)
mbedtls_svc_key_id_t shared_secret_key = MBEDTLS_SVC_KEY_ID_INIT;
psa_status_t shared_secret_key_destruction_status =
PSA_ERROR_GENERIC_ERROR;
if (handshake->xxdh_psa_iop_active == 0) {
psa_key_attributes_t secret_attributes =
psa_key_attributes_init();

2
library/x509write_csr.c
View File

@ -226,7 +226,7 @@ static int x509write_csr_der_internal(mbedtls_x509write_csr *ctx,
return MBEDTLS_ERR_X509_INVALID_ALG;
}
if ((ret = mbedtls_pk_sign_ext(pk_alg, ctx->key, ctx->md_alg, hash, 0,
if ((ret = mbedtls_pk_sign_ext(pk_alg, ctx->key, ctx->md_alg, hash, hash_len,
sig, sig_size, &sig_len)) != 0) {
return ret;
}

2
tf-psa-crypto

@ -1 +1 @@
Subproject commit 2a327c5e75f1c87d205370fc967732e674a22a69
Subproject commit 886d403744605f262cd9dfd54f8d8f8beff42c95