ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-12 09:54:38 +08:00
Code Issues Releases Wiki Activity

Merge pull request #8643 from gilles-peskine-arm/tls12_server-pk_opaque-dead_code

Browse Source 
Guard configuration-specific code in ssl_tls12_server.c
This commit is contained in:
Gilles Peskine 2024-05-30 17:24:33 +00:00 committed by GitHub
commit 8c60b16188
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/ssl_tls12_server.c
View File

@ -2631,13 +2631,8 @@ static int ssl_get_ecdh_params_from_cert(mbedtls_ssl_context *ssl)
ssl->handshake->xxdh_psa_type = psa_get_key_type(&key_attributes); ssl->handshake->xxdh_psa_type = psa_get_key_type(&key_attributes);
ssl->handshake->xxdh_psa_bits = psa_get_key_bits(&key_attributes); ssl->handshake->xxdh_psa_bits = psa_get_key_bits(&key_attributes);
if (pk_type == MBEDTLS_PK_OPAQUE) { #if defined(MBEDTLS_PK_USE_PSA_EC_DATA)
/* Opaque key is created by the user (externally from Mbed TLS) if (pk_type != MBEDTLS_PK_OPAQUE) {
* so we assume it already has the right algorithm and flags
* set. Just copy its ID as reference. */
ssl->handshake->xxdh_psa_privkey = pk->priv_id;
ssl->handshake->xxdh_psa_privkey_is_external = 1;
} else {
/* PK_ECKEY[_DH] and PK_ECDSA instead as parsed from the PK /* PK_ECKEY[_DH] and PK_ECDSA instead as parsed from the PK
* module and only have ECDSA capabilities. Since we need * module and only have ECDSA capabilities. Since we need
* them for ECDH later, we export and then re-import them with * them for ECDH later, we export and then re-import them with
@ -2665,10 +2660,20 @@ static int ssl_get_ecdh_params_from_cert(mbedtls_ssl_context *ssl)
/* Set this key as owned by the TLS library: it will be its duty /* Set this key as owned by the TLS library: it will be its duty
* to clear it exit. */ * to clear it exit. */
ssl->handshake->xxdh_psa_privkey_is_external = 0; ssl->handshake->xxdh_psa_privkey_is_external = 0;
}
ret = 0; ret = 0;
break; break;
}
#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
/* Opaque key is created by the user (externally from Mbed TLS)
* so we assume it already has the right algorithm and flags
* set. Just copy its ID as reference. */
ssl->handshake->xxdh_psa_privkey = pk->priv_id;
ssl->handshake->xxdh_psa_privkey_is_external = 1;
ret = 0;
break;
#if !defined(MBEDTLS_PK_USE_PSA_EC_DATA) #if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
case MBEDTLS_PK_ECKEY: case MBEDTLS_PK_ECKEY:
case MBEDTLS_PK_ECKEY_DH: case MBEDTLS_PK_ECKEY_DH: