AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename new_session_ticket state

Browse Source 
Both client and server side use
`MBEDTLS_SSL_NEW_SESSION_TICKET` now

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-07-12 05:36:45 +00:00
parent 29ab32d0e5
commit a357cf4d4c
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/mbedtls/ssl.h
View File

@ -651,7 +651,7 @@ typedef enum
MBEDTLS_SSL_FLUSH_BUFFERS, MBEDTLS_SSL_FLUSH_BUFFERS,
MBEDTLS_SSL_HANDSHAKE_WRAPUP, MBEDTLS_SSL_HANDSHAKE_WRAPUP,
MBEDTLS_SSL_HANDSHAKE_OVER, MBEDTLS_SSL_HANDSHAKE_OVER,
MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET, MBEDTLS_SSL_NEW_SESSION_TICKET,
MBEDTLS_SSL_SERVER_HELLO_VERIFY_REQUEST_SENT, MBEDTLS_SSL_SERVER_HELLO_VERIFY_REQUEST_SENT,
MBEDTLS_SSL_HELLO_RETRY_REQUEST, MBEDTLS_SSL_HELLO_RETRY_REQUEST,
MBEDTLS_SSL_ENCRYPTED_EXTENSIONS, MBEDTLS_SSL_ENCRYPTED_EXTENSIONS,
@ -660,7 +660,6 @@ typedef enum
MBEDTLS_SSL_CLIENT_CCS_BEFORE_2ND_CLIENT_HELLO, MBEDTLS_SSL_CLIENT_CCS_BEFORE_2ND_CLIENT_HELLO,
MBEDTLS_SSL_SERVER_CCS_AFTER_SERVER_HELLO, MBEDTLS_SSL_SERVER_CCS_AFTER_SERVER_HELLO,
MBEDTLS_SSL_SERVER_CCS_AFTER_HELLO_RETRY_REQUEST, MBEDTLS_SSL_SERVER_CCS_AFTER_HELLO_RETRY_REQUEST,
MBEDTLS_SSL_CLIENT_NEW_SESSION_TICKET,
} }
mbedtls_ssl_states; mbedtls_ssl_states;

2
library/ssl_msg.c
View File

@ -5304,7 +5304,7 @@ static int ssl_tls13_check_new_session_ticket( mbedtls_ssl_context *ssl )
MBEDTLS_SSL_DEBUG_MSG( 3, ( "NewSessionTicket received" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "NewSessionTicket received" ) );
mbedtls_ssl_handshake_set_state( ssl, mbedtls_ssl_handshake_set_state( ssl,
MBEDTLS_SSL_CLIENT_NEW_SESSION_TICKET ); MBEDTLS_SSL_NEW_SESSION_TICKET );
return( MBEDTLS_ERR_SSL_WANT_READ ); return( MBEDTLS_ERR_SSL_WANT_READ );
} }

4
library/ssl_tls12_client.c
View File

@ -3627,7 +3627,7 @@ int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl )
if( ssl->state == MBEDTLS_SSL_SERVER_CHANGE_CIPHER_SPEC && if( ssl->state == MBEDTLS_SSL_SERVER_CHANGE_CIPHER_SPEC &&
ssl->handshake->new_session_ticket != 0 ) ssl->handshake->new_session_ticket != 0 )
{ {
ssl->state = MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET; ssl->state = MBEDTLS_SSL_NEW_SESSION_TICKET;
} }
#endif #endif
@ -3704,7 +3704,7 @@ int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl )
* Finished * Finished
*/ */
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
case MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET: case MBEDTLS_SSL_NEW_SESSION_TICKET:
ret = ssl_parse_new_session_ticket( ssl ); ret = ssl_parse_new_session_ticket( ssl );
break; break;
#endif #endif

4
library/ssl_tls13_client.c
View File

@ -2077,7 +2077,7 @@ static int ssl_tls13_postprocess_new_session_ticket( mbedtls_ssl_context *ssl )
} }
/* /*
* Handler for MBEDTLS_SSL_CLIENT_NEW_SESSION_TICKET * Handler for MBEDTLS_SSL_NEW_SESSION_TICKET
*/ */
static int ssl_tls13_process_new_session_ticket( mbedtls_ssl_context *ssl ) static int ssl_tls13_process_new_session_ticket( mbedtls_ssl_context *ssl )
{ {
@ -2185,7 +2185,7 @@ int mbedtls_ssl_tls13_handshake_client_step( mbedtls_ssl_context *ssl )
#endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */ #endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
case MBEDTLS_SSL_CLIENT_NEW_SESSION_TICKET: case MBEDTLS_SSL_NEW_SESSION_TICKET:
ret = ssl_tls13_process_new_session_ticket( ssl ); ret = ssl_tls13_process_new_session_ticket( ssl );
if( ret != 0 ) if( ret != 0 )
break; break;

4
tests/ssl-opt.sh
View File

@ -12609,7 +12609,7 @@ run_test "TLS 1.3: NewSessionTicket: Basic check, m->O" \
"$P_CLI debug_level=4" \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "Protocol is TLSv1.3" \ -c "Protocol is TLSv1.3" \
-c "MBEDTLS_SSL_CLIENT_NEW_SESSION_TICKET" \ -c "MBEDTLS_SSL_NEW_SESSION_TICKET" \
-c "got new session ticket." \ -c "got new session ticket." \
-c "HTTP/1.0 200 ok" -c "HTTP/1.0 200 ok"
@ -12623,7 +12623,7 @@ run_test "TLS 1.3: NewSessionTicket: Basic check, m->G" \
"$P_CLI debug_level=4" \ "$P_CLI debug_level=4" \
0 \ 0 \
-c "Protocol is TLSv1.3" \ -c "Protocol is TLSv1.3" \
-c "MBEDTLS_SSL_CLIENT_NEW_SESSION_TICKET" \ -c "MBEDTLS_SSL_NEW_SESSION_TICKET" \
-c "got new session ticket." \ -c "got new session ticket." \
-c "HTTP/1.0 200 OK" -c "HTTP/1.0 200 OK"

2
tests/suites/test_suite_ssl.data
View File

@ -223,7 +223,7 @@ move_handshake_to_state:MBEDTLS_SSL_IS_CLIENT:MBEDTLS_SSL_SERVER_HELLO_VERIFY_RE
Negative test moving servers ssl to state: NEW_SESSION_TICKET Negative test moving servers ssl to state: NEW_SESSION_TICKET
depends_on:MBEDTLS_SSL_PROTO_TLS1_2 depends_on:MBEDTLS_SSL_PROTO_TLS1_2
move_handshake_to_state:MBEDTLS_SSL_IS_SERVER:MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET:0 move_handshake_to_state:MBEDTLS_SSL_IS_SERVER:MBEDTLS_SSL_NEW_SESSION_TICKET:0
TLS 1.3:Test moving clients handshake to state: ENCRYPTED_EXTENSIONS TLS 1.3:Test moving clients handshake to state: ENCRYPTED_EXTENSIONS
depends_on:MBEDTLS_SSL_PROTO_TLS1_3:!MBEDTLS_SSL_PROTO_TLS1_2 depends_on:MBEDTLS_SSL_PROTO_TLS1_3:!MBEDTLS_SSL_PROTO_TLS1_2