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

Move session ticket keys to conf

Browse source 
This is temporary, they will soon be replaced by callbacks.
!!! In this intermediate step security is removed !!!
This commit is contained in:
Manuel Pégourié-Gonnard 2015-05-06 10:05:11 +01:00
parent e51bba05cf
commit 2b49445876
5 changed files with 34 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/mbedtls/ssl.h
View file

@ -864,6 +864,10 @@ typedef struct
const char **alpn_list; /*!< ordered list of protocols */
#endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS)
mbedtls_ssl_ticket_keys *ticket_keys; /*!< keys for ticket encryption */
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
/*
* Numerical settings (int then char)
*/
@ -1055,13 +1059,6 @@ struct mbedtls_ssl_context
const char *peer_cn; /*!< expected peer CN */
#endif /* MBEDTLS_X509_CRT_PARSE_C */
/*
* Support for generating and checking session tickets
*/
#if defined(MBEDTLS_SSL_SESSION_TICKETS)
mbedtls_ssl_ticket_keys *ticket_keys; /*!< keys for ticket encryption */
#endif /* MBEDTLS_SSL_SESSION_TICKETS */
int client_auth; /*!< flag for client auth. */
int verify_result; /*!< verification result */
@ -1928,14 +1925,14 @@ void mbedtls_ssl_set_cbc_record_splitting( mbedtls_ssl_config *conf, char split
* to allow generating the ticket encryption and
* authentication keys.
*
* \param ssl SSL context
* \param conf SSL configuration
* \param use_tickets Enable or disable (MBEDTLS_SSL_SESSION_TICKETS_ENABLED or
* MBEDTLS_SSL_SESSION_TICKETS_DISABLED)
*
* \return O if successful,
* or a specific error code (server only).
*/
int mbedtls_ssl_set_session_tickets( mbedtls_ssl_context *ssl, int use_tickets );
int mbedtls_ssl_set_session_tickets( mbedtls_ssl_config *conf, int use_tickets );
/**
* \brief Set session ticket lifetime (server only)