eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename functions and add test messages

Browse source 
Change-Id: Iab51b031ae82d7b2d384de708858be64be75f9ed
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2022-07-21 02:26:21 +00:00 • committed by Ronald Cron
parent 088c92977e
commit 3ad67bf4e3
5 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/ssl_client.c
View file

@ -650,7 +650,7 @@ static int ssl_write_client_hello_body( mbedtls_ssl_context *ssl,
*/ */
if( propose_tls13 && mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) ) if( propose_tls13 && mbedtls_ssl_conf_tls13_some_psk_enabled( ssl ) )
{ {
ret = mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders( ret = mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
ssl, p, end, &output_len, binders_len ); ssl, p, end, &output_len, binders_len );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );

2
library/ssl_misc.h
View file

@ -2448,7 +2448,7 @@ int mbedtls_ssl_get_psk_to_offer(
* the extension. * the extension.
*/ */
MBEDTLS_CHECK_RETURN_CRITICAL MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders( int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
mbedtls_ssl_context *ssl, mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *end, unsigned char *buf, unsigned char *end,
size_t *out_len, size_t *binders_len ); size_t *out_len, size_t *binders_len );

2
library/ssl_tls13_client.c
View file

@ -692,7 +692,7 @@ static int ssl_tls13_write_psk_key_exchange_modes_ext( mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
int mbedtls_ssl_tls13_write_pre_shared_key_ext_without_binders( int mbedtls_ssl_tls13_write_identities_of_pre_shared_key_ext(
mbedtls_ssl_context *ssl, mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *end, unsigned char *buf, unsigned char *end,
size_t *out_len, size_t *binders_len ) size_t *out_len, size_t *binders_len )

1
library/ssl_tls13_generic.c
View file

@ -1509,7 +1509,6 @@ int mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange(
/* Check if we have any PSK to offer, returns 0 if PSK is available. /* Check if we have any PSK to offer, returns 0 if PSK is available.
* Assign the psk and ticket if pointers are present. * Assign the psk and ticket if pointers are present.
*/ */
MBEDTLS_CHECK_RETURN_CRITICAL
int mbedtls_ssl_get_psk_to_offer( int mbedtls_ssl_get_psk_to_offer(
const mbedtls_ssl_context *ssl, const mbedtls_ssl_context *ssl,
int *psk_type, int *psk_type,

2
tests/ssl-opt.sh
View file

@ -12027,6 +12027,8 @@ run_test "TLS 1.3, default suite, PSK - gnutls" \
-c "client hello, adding pre_shared_key extension, omitting PSK binder list" \ -c "client hello, adding pre_shared_key extension, omitting PSK binder list" \
-c "client hello, adding psk_key_exchange_modes extension" \ -c "client hello, adding psk_key_exchange_modes extension" \
-c "client hello, adding PSK binder list" \ -c "client hello, adding PSK binder list" \
-s "Parsing extension 'PSK Key Exchange Modes/45'" \
-s "Parsing extension 'Pre Shared Key/41'" \
-c "<= write client hello" -c "<= write client hello"
for i in opt-testcases/*.sh for i in opt-testcases/*.sh