commit e057d3bf6b30bd950736eb0cf2cd6b1bf44e7d5a
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 20 10:59:43 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed May 20 11:14:57 2015 +0200
tree 0eb44f630b782487854b8952d5a34e8e9e91945c
parent b596abfdc05665cd4a14b92ccfe85da70bbf7448

Relax some dependencies

- DTLS_HELLO_VERIFY no longer depends on SRV_C
- SSL_COOKIE_C no longer depends on DTLS_HELLO_VERIFY

Not that much work for us, and easier on users (esp. since it allows just
disabling SRV_C alone).

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 8b96a83..79d1b93 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4950,7 +4950,7 @@
     return( 0 );
 }
 
-#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY)
+#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY) && defined(MBEDTLS_SSL_SRV_C)
 /* Dummy cookie callbacks for defaults */
 static int ssl_cookie_write_dummy( void *ctx,
                       unsigned char **p, unsigned char *end,
@@ -4977,7 +4977,7 @@
 
     return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
 }
-#endif /* MBEDTLS_SSL_DTLS_HELLO_VERIFY */
+#endif /* MBEDTLS_SSL_DTLS_HELLO_VERIFY && MBEDTLS_SSL_SRV_C */
 
 /*
  * Initialize an SSL context
@@ -5136,7 +5136,7 @@
     ssl->alpn_chosen = NULL;
 #endif
 
-#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY)
+#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY) && defined(MBEDTLS_SSL_SRV_C)
     mbedtls_free( ssl->cli_id );
     ssl->cli_id = NULL;
     ssl->cli_id_len = 0;
@@ -6572,7 +6572,7 @@
     }
 #endif
 
-#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY)
+#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY) && defined(MBEDTLS_SSL_SRV_C)
     mbedtls_free( ssl->cli_id );
 #endif
 
@@ -6654,7 +6654,7 @@
     conf->curve_list = mbedtls_ecp_grp_id_list( );
 #endif
 
-#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY)
+#if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY) && defined(MBEDTLS_SSL_SRV_C)
     conf->f_cookie_write = ssl_cookie_write_dummy;
     conf->f_cookie_check = ssl_cookie_check_dummy;
 #endif