cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use internal PSK getter

Browse Source 
Signed-off-by: Guilhem Bryant <Guilhem.Bryant@arm.com>
This commit is contained in:
Guilhem Bryant 2020-03-25 17:08:15 +00:00
parent d511ac3419
commit c5285d8c40
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/ssl_tls.c
View File

@ -1514,9 +1514,7 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
MBEDTLS_SSL_DEBUG_MSG( 2, ( "perform PSA-based PSK-to-MS expansion" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "perform PSA-based PSK-to-MS expansion" ) );
psk = ssl->conf->psk_opaque; psk = mbedtls_ssl_get_opaque_psk( ssl );
if( handshake->psk_opaque != 0 )
psk = handshake->psk_opaque;
if( hash_alg == MBEDTLS_MD_SHA384 ) if( hash_alg == MBEDTLS_MD_SHA384 )
alg = PSA_ALG_TLS12_PSK_TO_MS(PSA_ALG_SHA_384); alg = PSA_ALG_TLS12_PSK_TO_MS(PSA_ALG_SHA_384);
@ -1850,15 +1848,16 @@ int mbedtls_ssl_psk_derive_premaster( mbedtls_ssl_context *ssl, mbedtls_key_exch
{ {
unsigned char *p = ssl->handshake->premaster; unsigned char *p = ssl->handshake->premaster;
unsigned char *end = p + sizeof( ssl->handshake->premaster ); unsigned char *end = p + sizeof( ssl->handshake->premaster );
const unsigned char *psk = ssl->conf->psk; const unsigned char *psk;
size_t psk_len = ssl->conf->psk_len; size_t psk_len;
/* If the psk callback was called, use its result */ if( mbedtls_ssl_get_psk( ssl, &psk, &psk_len )
if( ssl->handshake->psk != NULL ) == MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED )
{ /*
psk = ssl->handshake->psk; * This should never happen because the existence of a PSK is always
psk_len = ssl->handshake->psk_len; * checked before calling this function
} */
MBEDTLS_SSL_DEBUG_MSG(1, ("should never happen"));
/* /*
* PMS = struct { * PMS = struct {