commit 8b431fbbec8e7bcfa35e20ca38a8573898613a56
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon May 11 12:54:52 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Mon May 11 14:35:42 2015 +0200
tree 171be3ea7d6c1fd911a3a8acf2abe8b1f446007a
parent fd862b14c504fbb59c5692b043d9bf33ff51a9d0

Fix dependency issues

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 3e2b901..b442e65 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -2725,9 +2725,12 @@
      * opaque DistinguishedName<1..2^16-1>;
      */
     p += 2;
-    crt = ssl->handshake->sni_ca_chain != NULL ?
-          ssl->handshake->sni_ca_chain :
-          ssl->conf->ca_chain;
+#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
+    if( ssl->handshake->sni_ca_chain != NULL )
+        crt = ssl->handshake->sni_ca_chain;
+    else
+#endif
+        crt = ssl->conf->ca_chain;
 
     total_dn_size = 0;
     while( crt != NULL && crt->version != 0 )

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index be7a25f..0a8119e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -4032,12 +4032,14 @@
         mbedtls_x509_crt *ca_chain;
         mbedtls_x509_crl *ca_crl;
 
+#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
         if( ssl->handshake->sni_ca_chain != NULL )
         {
             ca_chain = ssl->handshake->sni_ca_chain;
             ca_crl   = ssl->handshake->sni_ca_crl;
         }
         else
+#endif
         {
             ca_chain = ssl->conf->ca_chain;
             ca_crl   = ssl->conf->ca_crl;
@@ -6616,7 +6618,9 @@
 int mbedtls_ssl_config_defaults( mbedtls_ssl_config *conf,
                                  int endpoint, int transport )
 {
+#if defined(MBEDTLS_DHM_C) && defined(MBEDTLS_SSL_SRV_C)
     int ret;
+#endif
 
     conf->endpoint  = endpoint;
     conf->transport = transport;