commit b596abfdc05665cd4a14b92ccfe85da70bbf7448
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 20 10:45:29 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 20 11:14:57 2015 +0200
tree a9a8e4c0ca1e667a5f97f1483faa526484dc807a
parent cf141ca7e7d213c05f2dce803ce65975d5e58d55

Refine cli/srv ifdefs for session tickets

- Only the server needs to generate/parse tickets
- Only the client needs to store them

Also adjust prototype of ssl_conf_session_tickets() while at it.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index a716662..8b96a83 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -188,7 +188,7 @@
     }
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS)
+#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_CLI_C)
     if( src->ticket != NULL )
     {
         dst->ticket = mbedtls_malloc( src->ticket_len );
@@ -197,7 +197,7 @@
 
         memcpy( dst->ticket, src->ticket, src->ticket_len );
     }
-#endif /* MBEDTLS_SSL_SESSION_TICKETS */
+#endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */
 
     return( 0 );
 }
@@ -5639,13 +5639,14 @@
 #endif /* MBEDTLS_SSL_RENEGOTIATION */
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
-int mbedtls_ssl_conf_session_tickets( mbedtls_ssl_config *conf, int use_tickets )
+#if defined(MBEDTLS_SSL_CLI_C)
+void mbedtls_ssl_conf_session_tickets( mbedtls_ssl_config *conf, int use_tickets )
 {
     conf->session_tickets = use_tickets;
-
-    return( 0 );
 }
+#endif
 
+#if defined(MBEDTLS_SSL_SRV_C)
 void mbedtls_ssl_conf_session_tickets_cb( mbedtls_ssl_config *conf,
         mbedtls_ssl_ticket_write_t *f_ticket_write,
         mbedtls_ssl_ticket_parse_t *f_ticket_parse,
@@ -5655,6 +5656,7 @@
     conf->f_ticket_parse = f_ticket_parse;
     conf->p_ticket       = p_ticket;
 }
+#endif
 #endif /* MBEDTLS_SSL_SESSION_TICKETS */
 
 /*
@@ -6494,7 +6496,7 @@
     }
 #endif
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS)
+#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_CLI_C)
     mbedtls_free( session->ticket );
 #endif