mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-04-17 20:42:44 +00:00
fix various issues
- Add comments for ticket test hooks - improve code style. Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
parent
03511b00aa
commit
f16efbc78d
@ -195,8 +195,9 @@ static int ssl_tls13_offered_psks_check_identity_match_ticket(
|
|||||||
|
|
||||||
if (now < session->start) {
|
if (now < session->start) {
|
||||||
MBEDTLS_SSL_DEBUG_MSG(
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
3, ("Invalid ticket start time ( now=%" MBEDTLS_PRINTF_MS_TIME
|
3, ("Invalid ticket start time ( now = %" MBEDTLS_PRINTF_MS_TIME
|
||||||
", start=%" MBEDTLS_PRINTF_MS_TIME " )", now, session->start));
|
", start = %" MBEDTLS_PRINTF_MS_TIME " )",
|
||||||
|
now, session->start));
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -213,7 +214,7 @@ static int ssl_tls13_offered_psks_check_identity_match_ticket(
|
|||||||
*
|
*
|
||||||
* For time being, the age MUST be less than 604800 seconds (7 days).
|
* For time being, the age MUST be less than 604800 seconds (7 days).
|
||||||
*/
|
*/
|
||||||
if (server_age > 604800*1000) {
|
if (server_age > 604800 * 1000) {
|
||||||
MBEDTLS_SSL_DEBUG_MSG(
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
3, ("Ticket age exceeds limitation ticket_age=%" MBEDTLS_PRINTF_MS_TIME,
|
3, ("Ticket age exceeds limitation ticket_age=%" MBEDTLS_PRINTF_MS_TIME,
|
||||||
server_age));
|
server_age));
|
||||||
@ -238,7 +239,8 @@ static int ssl_tls13_offered_psks_check_identity_match_ticket(
|
|||||||
if (age_diff < -1000 ||
|
if (age_diff < -1000 ||
|
||||||
age_diff > MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE) {
|
age_diff > MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE) {
|
||||||
MBEDTLS_SSL_DEBUG_MSG(
|
MBEDTLS_SSL_DEBUG_MSG(
|
||||||
3, ("Ticket age outside tolerance window ( diff=%" MBEDTLS_PRINTF_MS_TIME ")",
|
3, ("Ticket age outside tolerance window ( diff = %"
|
||||||
|
MBEDTLS_PRINTF_MS_TIME ")",
|
||||||
age_diff));
|
age_diff));
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
|
@ -1416,35 +1416,43 @@ int dummy_ticket_parse(void *p_ticket, mbedtls_ssl_session *session,
|
|||||||
|
|
||||||
switch (opt.dummy_ticket % 11) {
|
switch (opt.dummy_ticket % 11) {
|
||||||
case 1:
|
case 1:
|
||||||
|
/* Callback function return INVALID_MAC */
|
||||||
return MBEDTLS_ERR_SSL_INVALID_MAC;
|
return MBEDTLS_ERR_SSL_INVALID_MAC;
|
||||||
case 2:
|
case 2:
|
||||||
|
/* Callback function return ticket expired */
|
||||||
return MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED;
|
return MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED;
|
||||||
case 3:
|
case 3:
|
||||||
|
/* Built-in check, the start time is in future. */
|
||||||
session->start = mbedtls_ms_time() + 10 * 1000;
|
session->start = mbedtls_ms_time() + 10 * 1000;
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
|
/* Built-in check, ticket expired due to too old. */
|
||||||
session->start = mbedtls_ms_time() - 10 * 1000 - 7 * 24 * 3600 * 1000;
|
session->start = mbedtls_ms_time() - 10 * 1000 - 7 * 24 * 3600 * 1000;
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
|
/* Built-in check, age outside tolerance window, too young. */
|
||||||
session->start = mbedtls_ms_time() - 10 * 1000;
|
session->start = mbedtls_ms_time() - 10 * 1000;
|
||||||
break;
|
break;
|
||||||
|
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
|
||||||
case 6:
|
case 6:
|
||||||
|
/* Built-in check, age outside tolerance window, too old. */
|
||||||
session->start = mbedtls_ms_time();
|
session->start = mbedtls_ms_time();
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
|
|
||||||
session->ticket_age_add -= 1000;
|
session->ticket_age_add -= 1000;
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
|
|
||||||
case 7:
|
case 7:
|
||||||
|
/* Built-in check, ticket permission check. */
|
||||||
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_NONE;
|
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_NONE;
|
||||||
break;
|
break;
|
||||||
case 8:
|
case 8:
|
||||||
|
/* Built-in check, ticket permission check. */
|
||||||
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK;
|
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK;
|
||||||
break;
|
break;
|
||||||
case 9:
|
case 9:
|
||||||
|
/* Built-in check, ticket permission check. */
|
||||||
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL;
|
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL;
|
||||||
break;
|
break;
|
||||||
case 10:
|
case 10:
|
||||||
|
/* Built-in check, ticket permission check. */
|
||||||
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL;
|
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ALL;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user