Add NEW_SESSION_TICKET* into handshake over states
All state list after HANDSHAKE_OVER as is_handshakeover Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
parent
6848a61922
commit
5ed73ff6de
2 changed files with 4 additions and 6 deletions
|
@ -661,8 +661,6 @@ typedef enum
|
||||||
MBEDTLS_SSL_SERVER_FINISHED,
|
MBEDTLS_SSL_SERVER_FINISHED,
|
||||||
MBEDTLS_SSL_FLUSH_BUFFERS,
|
MBEDTLS_SSL_FLUSH_BUFFERS,
|
||||||
MBEDTLS_SSL_HANDSHAKE_WRAPUP,
|
MBEDTLS_SSL_HANDSHAKE_WRAPUP,
|
||||||
MBEDTLS_SSL_HANDSHAKE_OVER,
|
|
||||||
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,
|
||||||
|
@ -671,6 +669,8 @@ 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_HANDSHAKE_OVER,
|
||||||
|
MBEDTLS_SSL_NEW_SESSION_TICKET,
|
||||||
MBEDTLS_SSL_NEW_SESSION_TICKET_FLUSH,
|
MBEDTLS_SSL_NEW_SESSION_TICKET_FLUSH,
|
||||||
}
|
}
|
||||||
mbedtls_ssl_states;
|
mbedtls_ssl_states;
|
||||||
|
@ -4651,9 +4651,7 @@ int mbedtls_ssl_handshake( mbedtls_ssl_context *ssl );
|
||||||
*/
|
*/
|
||||||
static inline int mbedtls_ssl_is_handshake_over( mbedtls_ssl_context *ssl )
|
static inline int mbedtls_ssl_is_handshake_over( mbedtls_ssl_context *ssl )
|
||||||
{
|
{
|
||||||
return( ssl->MBEDTLS_PRIVATE( state ) == MBEDTLS_SSL_HANDSHAKE_OVER ||
|
return( ssl->MBEDTLS_PRIVATE( state ) >= MBEDTLS_SSL_HANDSHAKE_OVER );
|
||||||
ssl->MBEDTLS_PRIVATE( state ) == MBEDTLS_SSL_NEW_SESSION_TICKET ||
|
|
||||||
ssl->MBEDTLS_PRIVATE( state ) == MBEDTLS_SSL_NEW_SESSION_TICKET_FLUSH);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -7544,7 +7544,7 @@ void mbedtls_ssl_handshake_wrapup( mbedtls_ssl_context *ssl )
|
||||||
#endif
|
#endif
|
||||||
mbedtls_ssl_handshake_wrapup_free_hs_transform( ssl );
|
mbedtls_ssl_handshake_wrapup_free_hs_transform( ssl );
|
||||||
|
|
||||||
ssl->state++;
|
ssl->state = MBEDTLS_SSL_HANDSHAKE_OVER;
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "<= handshake wrapup" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 3, ( "<= handshake wrapup" ) );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue