mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-30 06:33:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Inprove code base on review comments

Browse Source 
Change debug messag for server finished.
Change name of generate_application_keys.
Remove the client vertificate tests from ssl-opt.sh.
Add test strings for server finished in ssl-opt.sh.

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2021-11-10 06:17:40 +00:00
parent 57b2aff8a8
commit d0aa3e9307
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/ssl_tls13_generic.c
View File

@ -920,12 +920,12 @@ static int ssl_tls13_postprocess_server_finished_message( mbedtls_ssl_context *s
goto cleanup; goto cleanup;
} }
ret = mbedtls_ssl_tls1_3_generate_application_keys( ret = mbedtls_ssl_tls13_generate_application_keys(
ssl, &traffic_keys ); ssl, &traffic_keys );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, MBEDTLS_SSL_DEBUG_RET( 1,
"mbedtls_ssl_tls1_3_generate_application_keys", ret ); "mbedtls_ssl_tls13_generate_application_keys", ret );
goto cleanup; goto cleanup;
} }
@ -981,7 +981,7 @@ int mbedtls_ssl_tls13_process_finished_message( mbedtls_ssl_context *ssl )
unsigned char *buf; unsigned char *buf;
size_t buflen; size_t buflen;
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse finished_in" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse finished message" ) );
/* Preprocessing step: Compute handshake digest */ /* Preprocessing step: Compute handshake digest */
MBEDTLS_SSL_PROC_CHK( ssl_tls13_preprocess_finished_message( ssl ) ); MBEDTLS_SSL_PROC_CHK( ssl_tls13_preprocess_finished_message( ssl ) );
@ -996,7 +996,7 @@ int mbedtls_ssl_tls13_process_finished_message( mbedtls_ssl_context *ssl )
cleanup: cleanup:
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= parse finished_in" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= parse finished message" ) );
return( ret ); return( ret );
} }

2
library/ssl_tls13_keys.c
View File

@ -1111,7 +1111,7 @@ int mbedtls_ssl_tls13_key_schedule_stage_handshake( mbedtls_ssl_context *ssl )
/* Generate application traffic keys since any records following a 1-RTT Finished message /* Generate application traffic keys since any records following a 1-RTT Finished message
* MUST be encrypted under the application traffic key. * MUST be encrypted under the application traffic key.
*/ */
int mbedtls_ssl_tls1_3_generate_application_keys( int mbedtls_ssl_tls13_generate_application_keys(
mbedtls_ssl_context *ssl, mbedtls_ssl_context *ssl,
mbedtls_ssl_key_set *traffic_keys ) mbedtls_ssl_key_set *traffic_keys )
{ {

4
library/ssl_tls13_keys.h
View File

@ -577,7 +577,7 @@ int mbedtls_ssl_tls13_generate_handshake_keys( mbedtls_ssl_context *ssl,
* with states Initial -> Early -> Handshake -> Application, and * with states Initial -> Early -> Handshake -> Application, and
* this function represents the Handshake -> Application transition. * this function represents the Handshake -> Application transition.
* *
* In the handshake stage, mbedtls_ssl_tls1_3_generate_application_keys() * In the handshake stage, mbedtls_ssl_tls13_generate_application_keys()
* can be used to derive the handshake traffic keys. * can be used to derive the handshake traffic keys.
* *
* \param ssl The SSL context to operate on. This must be in key schedule * \param ssl The SSL context to operate on. This must be in key schedule
@ -601,7 +601,7 @@ int mbedtls_ssl_tls13_key_schedule_stage_application(
* \returns \c 0 on success. * \returns \c 0 on success.
* \returns A negative error code on failure. * \returns A negative error code on failure.
*/ */
int mbedtls_ssl_tls1_3_generate_application_keys( int mbedtls_ssl_tls13_generate_application_keys(
mbedtls_ssl_context* ssl, mbedtls_ssl_key_set *traffic_keys ); mbedtls_ssl_context* ssl, mbedtls_ssl_key_set *traffic_keys );
/** /**

11
tests/ssl-opt.sh
View File

@ -8820,9 +8820,7 @@ run_test "TLS1.3: Test client hello msg work - openssl" \
-c "tls1_3 client state: 19" \ -c "tls1_3 client state: 19" \
-c "tls1_3 client state: 5" \ -c "tls1_3 client state: 5" \
-c "tls1_3 client state: 3" \ -c "tls1_3 client state: 3" \
-c "tls1_3 client state: 9" \
-c "tls1_3 client state: 13" \ -c "tls1_3 client state: 13" \
-c "tls1_3 client state: 7" \
-c "tls1_3 client state: 20" \ -c "tls1_3 client state: 20" \
-c "tls1_3 client state: 11" \ -c "tls1_3 client state: 11" \
-c "tls1_3 client state: 14" \ -c "tls1_3 client state: 14" \
@ -8835,7 +8833,8 @@ run_test "TLS1.3: Test client hello msg work - openssl" \
-c "Certificate verification flags clear" \ -c "Certificate verification flags clear" \
-c "=> parse certificate verify" \ -c "=> parse certificate verify" \
-c "<= parse certificate verify" \ -c "<= parse certificate verify" \
-c "mbedtls_ssl_tls13_process_certificate_verify() returned 0" -c "mbedtls_ssl_tls13_process_certificate_verify() returned 0" \
-c "<= parse finished message"
requires_gnutls_tls1_3 requires_gnutls_tls1_3
requires_gnutls_next_no_ticket requires_gnutls_next_no_ticket
@ -8853,9 +8852,7 @@ run_test "TLS1.3: Test client hello msg work - gnutls" \
-c "tls1_3 client state: 19" \ -c "tls1_3 client state: 19" \
-c "tls1_3 client state: 5" \ -c "tls1_3 client state: 5" \
-c "tls1_3 client state: 3" \ -c "tls1_3 client state: 3" \
-c "tls1_3 client state: 9" \
-c "tls1_3 client state: 13" \ -c "tls1_3 client state: 13" \
-c "tls1_3 client state: 7" \
-c "tls1_3 client state: 20" \ -c "tls1_3 client state: 20" \
-c "tls1_3 client state: 11" \ -c "tls1_3 client state: 11" \
-c "tls1_3 client state: 14" \ -c "tls1_3 client state: 14" \
@ -8868,7 +8865,9 @@ run_test "TLS1.3: Test client hello msg work - gnutls" \
-c "Certificate verification flags clear" \ -c "Certificate verification flags clear" \
-c "=> parse certificate verify" \ -c "=> parse certificate verify" \
-c "<= parse certificate verify" \ -c "<= parse certificate verify" \
-c "mbedtls_ssl_tls13_process_certificate_verify() returned 0" -c "mbedtls_ssl_tls13_process_certificate_verify() returned 0" \
-c "<= parse finished message"
# Test heap memory usage after handshake # Test heap memory usage after handshake
requires_config_enabled MBEDTLS_MEMORY_DEBUG requires_config_enabled MBEDTLS_MEMORY_DEBUG