eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust guards for dummy_tickets

Browse source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-10-08 12:40:33 +08:00
parent a99cbfa2d3
commit 03b8f9d299
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
programs/ssl/ssl_server2.c
View file

@ -1353,12 +1353,9 @@ int report_cid_usage( mbedtls_ssl_context *ssl,
} }
#endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */ #endif /* MBEDTLS_SSL_DTLS_CONNECTION_ID */
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \ #if defined(MBEDTLS_SSL_SESSION_TICKETS) && \
defined(MBEDTLS_SSL_SESSION_TICKETS) && \
defined(MBEDTLS_HAVE_TIME) defined(MBEDTLS_HAVE_TIME)
/* Functions for session ticket tests /* Functions for session ticket tests */
*
*/
int dummy_ticket_write( void *p_ticket, const mbedtls_ssl_session *session, int dummy_ticket_write( void *p_ticket, const mbedtls_ssl_session *session,
unsigned char *start, const unsigned char *end, unsigned char *start, const unsigned char *end,
size_t *tlen, uint32_t *ticket_lifetime ) size_t *tlen, uint32_t *ticket_lifetime )
@ -1403,6 +1400,7 @@ int dummy_ticket_parse( void *p_ticket, mbedtls_ssl_session *session,
return( MBEDTLS_ERR_SSL_INVALID_MAC ); return( MBEDTLS_ERR_SSL_INVALID_MAC );
case 2: case 2:
return( MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED ); return( MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED );
#if defined(MBEDTLS_HAVE_TIME)
case 3: case 3:
session->start = mbedtls_time( NULL ) + 10; session->start = mbedtls_time( NULL ) + 10;
break; break;
@ -1414,16 +1412,18 @@ int dummy_ticket_parse( void *p_ticket, mbedtls_ssl_session *session,
break; break;
case 6: case 6:
session->start = mbedtls_time( NULL ); session->start = mbedtls_time( NULL );
#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
session->ticket_age_add -= 1000; session->ticket_age_add -= 1000;
#endif
break; break;
#endif
default: default:
break; break;
} }
return( ret ); return( ret );
} }
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && #endif /* MBEDTLS_SSL_SESSION_TICKETS &&
MBEDTLS_SSL_SESSION_TICKETS &&
MBEDTLS_HAVE_TIME */ MBEDTLS_HAVE_TIME */
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
@ -3001,9 +3001,7 @@ int main( int argc, char *argv[] )
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
if( opt.tickets != MBEDTLS_SSL_SESSION_TICKETS_DISABLED ) if( opt.tickets != MBEDTLS_SSL_SESSION_TICKETS_DISABLED )
{ {
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \ #if defined(MBEDTLS_HAVE_TIME)
defined(MBEDTLS_SSL_SESSION_TICKETS) && \
defined(MBEDTLS_HAVE_TIME)
if( opt.dummy_ticket ) if( opt.dummy_ticket )
{ {
mbedtls_ssl_conf_session_tickets_cb( &conf, mbedtls_ssl_conf_session_tickets_cb( &conf,
@ -3012,9 +3010,7 @@ int main( int argc, char *argv[] )
NULL ); NULL );
} }
else else
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && #endif /* MBEDTLS_HAVE_TIME */
MBEDTLS_SSL_SESSION_TICKETS &&
MBEDTLS_HAVE_TIME */
{ {
if( ( ret = mbedtls_ssl_ticket_setup( &ticket_ctx, if( ( ret = mbedtls_ssl_ticket_setup( &ticket_ctx,
rng_get, &rng, rng_get, &rng,