rename `ticket_creation` to `ticket_creation_time`
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 9365c62..d011642 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1248,18 +1248,20 @@
uint8_t MBEDTLS_PRIVATE(ticket_flags); /*!< Ticket flags */
uint32_t MBEDTLS_PRIVATE(ticket_age_add); /*!< Randomly generated value used to obscure the age of the ticket */
uint8_t MBEDTLS_PRIVATE(resumption_key_len); /*!< resumption_key length */
-#if defined(MBEDTLS_HAVE_TIME)
- mbedtls_ms_time_t MBEDTLS_PRIVATE(ticket_creation); /*!< create time of ticket */
-#endif
unsigned char MBEDTLS_PRIVATE(resumption_key)[MBEDTLS_SSL_TLS1_3_TICKET_RESUMPTION_KEY_LEN];
#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION) && defined(MBEDTLS_SSL_CLI_C)
char *MBEDTLS_PRIVATE(hostname); /*!< host name binded with tickets */
#endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION && MBEDTLS_SSL_CLI_C */
-#if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_CLI_C)
- mbedtls_ms_time_t MBEDTLS_PRIVATE(ticket_received); /*!< time ticket was received */
-#endif /* MBEDTLS_HAVE_TIME && MBEDTLS_SSL_CLI_C */
+#if defined(MBEDTLS_HAVE_TIME)
+#if defined(MBEDTLS_SSL_CLI_C)
+ mbedtls_ms_time_t MBEDTLS_PRIVATE(ticket_received); /*!< time that ticket was received */
+#endif
+#if defined(MBEDTLS_SSL_SRV_C)
+ mbedtls_ms_time_t MBEDTLS_PRIVATE(ticket_creation_time); /*!< create time of ticket */
+#endif
+#endif /* MBEDTLS_HAVE_TIME */
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */
diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c
index 5fef4eb..0277bfa 100644
--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@@ -498,7 +498,7 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
if (session->tls_version == MBEDTLS_SSL_VERSION_TLS1_3) {
/* Check for expiration */
- mbedtls_ms_time_t ticket_age = mbedtls_ms_time() - session->ticket_creation;
+ mbedtls_ms_time_t ticket_age = mbedtls_ms_time() - session->ticket_creation_time;
mbedtls_ms_time_t ticket_lifetime = ctx->ticket_lifetime * 1000;
if (ticket_age < 0 || ticket_age > ticket_lifetime) {
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index d727636..42d1b86 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -2457,7 +2457,7 @@
* uint32 max_early_data_size;
* select ( endpoint ) {
* case client: ClientOnlyData;
- * case server: uint64 start_time;
+ * case server: uint64 ticket_creation_time_time;
* };
* } serialized_session_tls13;
*
@@ -2537,7 +2537,7 @@
#if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C)
if (session->endpoint == MBEDTLS_SSL_IS_SERVER) {
- MBEDTLS_PUT_UINT64_BE((uint64_t) session->ticket_creation, p, 0);
+ MBEDTLS_PUT_UINT64_BE((uint64_t) session->ticket_creation_time, p, 0);
p += 8;
}
#endif /* MBEDTLS_HAVE_TIME */
@@ -2616,7 +2616,7 @@
if (end - p < 8) {
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
}
- session->ticket_creation = MBEDTLS_GET_UINT64_BE(p, 0);
+ session->ticket_creation_time = MBEDTLS_GET_UINT64_BE(p, 0);
p += 8;
}
#endif /* MBEDTLS_HAVE_TIME */
diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 5c606e4..c9c0e1f 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -193,15 +193,15 @@
#if defined(MBEDTLS_HAVE_TIME)
now = mbedtls_ms_time();
- if (now < session->ticket_creation) {
+ if (now < session->ticket_creation_time) {
MBEDTLS_SSL_DEBUG_MSG(
3, ("Invalid ticket start time ( now = %" MBEDTLS_PRINTF_MS_TIME
", start = %" MBEDTLS_PRINTF_MS_TIME " )",
- now, session->ticket_creation));
+ now, session->ticket_creation_time));
goto exit;
}
- server_age = now - session->ticket_creation;
+ server_age = now - session->ticket_creation_time;
/* RFC 8446 section 4.6.1
*
@@ -2878,7 +2878,7 @@
MBEDTLS_SSL_DEBUG_MSG(2, ("=> prepare NewSessionTicket msg"));
#if defined(MBEDTLS_HAVE_TIME)
- session->ticket_creation = mbedtls_ms_time();
+ session->ticket_creation_time = mbedtls_ms_time();
#endif
/* Set ticket_flags depends on the advertised psk key exchange mode */
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index aa8afd9..1bfa529 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1422,28 +1422,28 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
case 3:
/* Creation time in the future. */
- session->ticket_creation = mbedtls_ms_time() +
- MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE +
- 4 * 1000;
+ session->ticket_creation_time = mbedtls_ms_time() +
+ MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE +
+ 4 * 1000;
break;
case 4:
/* Ticket reaches the end of lifetime. */
- session->ticket_creation = mbedtls_ms_time() - session->ticket_lifetime -
- MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE - 4 * 1000;
+ session->ticket_creation_time = mbedtls_ms_time() - session->ticket_lifetime -
+ MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE - 4 * 1000;
break;
case 5:
/* Ticket is valid, but client age is beyond the upper bound of tolerance window. */
session->ticket_age_add += MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE + 4 * 1000;
/* Make sure the execution time does not affect the result */
- session->ticket_creation = mbedtls_ms_time();
+ session->ticket_creation_time = mbedtls_ms_time();
break;
case 6:
/* Ticket is valid, but client age is beyond the lower bound of tolerance window. */
session->ticket_age_add -= MBEDTLS_SSL_TLS1_3_TICKET_AGE_TOLERANCE + 4 * 1000;
/* Make sure the execution time does not affect the result */
- session->ticket_creation = mbedtls_ms_time();
+ session->ticket_creation_time = mbedtls_ms_time();
break;
case 7:
session->ticket_flags = MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_NONE;
diff --git a/tests/src/test_helpers/ssl_helpers.c b/tests/src/test_helpers/ssl_helpers.c
index f7cd103..9acb199 100644
--- a/tests/src/test_helpers/ssl_helpers.c
+++ b/tests/src/test_helpers/ssl_helpers.c
@@ -1754,7 +1754,7 @@
#if defined(MBEDTLS_HAVE_TIME)
if (session->endpoint == MBEDTLS_SSL_IS_SERVER) {
- session->ticket_creation = mbedtls_ms_time() - 42;
+ session->ticket_creation_time = mbedtls_ms_time() - 42;
}
#endif
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 4f9ec1a..ebbbddb 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -1975,7 +1975,7 @@
#if defined(MBEDTLS_HAVE_TIME)
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
if (tls_version == MBEDTLS_SSL_VERSION_TLS1_3) {
- TEST_ASSERT(original.ticket_creation == restored.ticket_creation);
+ TEST_ASSERT(original.ticket_creation_time == restored.ticket_creation_time);
}
#endif
@@ -2066,7 +2066,7 @@
#if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C)
if (endpoint_type == MBEDTLS_SSL_IS_SERVER) {
- TEST_ASSERT(original.ticket_creation == restored.ticket_creation);
+ TEST_ASSERT(original.ticket_creation_time == restored.ticket_creation_time);
}
#endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_CLI_C)