ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-11 01:11:42 +08:00
Code Issues Releases Wiki Activity

Merge pull request #8384 from paul-elliott-arm/remove_ssl_null_tls12

Browse Source 
Remove NULLing of ssl context in TLS1.2 transform population
This commit is contained in:
Tom Cosgrove 2023-12-21 13:28:09 +00:00 committed by GitHub
commit c6088eceb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/ssl_tls.c
View File

@ -8215,14 +8215,6 @@ static int ssl_tls12_populate_transform(mbedtls_ssl_transform *transform,
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
#endif #endif
#if !defined(MBEDTLS_DEBUG_C) && \
!defined(MBEDTLS_SSL_DTLS_CONNECTION_ID)
if (ssl->f_export_keys == NULL) {
ssl = NULL; /* make sure we don't use it except for these cases */
(void) ssl;
}
#endif
/* /*
* Some data just needs copying into the structure * Some data just needs copying into the structure
*/ */
@ -8494,7 +8486,7 @@ static int ssl_tls12_populate_transform(mbedtls_ssl_transform *transform,
goto end; goto end;
} }
if (ssl != NULL && ssl->f_export_keys != NULL) { if (ssl->f_export_keys != NULL) {
ssl->f_export_keys(ssl->p_export_keys, ssl->f_export_keys(ssl->p_export_keys,
MBEDTLS_SSL_KEY_EXPORT_TLS12_MASTER_SECRET, MBEDTLS_SSL_KEY_EXPORT_TLS12_MASTER_SECRET,
master, 48, master, 48,