commit 66dc5555f0fba15fb3fa262ebb742279d2eeaa77
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu May 14 12:28:21 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu May 14 12:31:10 2015 +0200
tree f88eb2b4bbe905ef0e5535d8e28fcd0f52469040
parent 22404866af2e12eeb23d3140d8785571f9587cf5

mbedtls_ssl_conf_arc4_support() depends on ARC4_C

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index c16b6e7..f344907 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -711,9 +711,11 @@
             continue;
 #endif
 
+#if defined(MBEDTLS_ARC4_C)
         if( ssl->conf->arc4_disabled == MBEDTLS_SSL_ARC4_DISABLED &&
             ciphersuite_info->cipher == MBEDTLS_CIPHER_ARC4_128 )
             continue;
+#endif
 
         MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, add ciphersuite: %2d",
                        ciphersuites[i] ) );
@@ -1405,15 +1407,17 @@
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, compress alg.: %d", buf[37 + n] ) );
 
     suite_info = mbedtls_ssl_ciphersuite_from_id( ssl->session_negotiate->ciphersuite );
-    if( suite_info == NULL ||
-        ( ssl->conf->arc4_disabled &&
-          suite_info->cipher == MBEDTLS_CIPHER_ARC4_128 ) )
+    if( suite_info == NULL
+#if defined(MBEDTLS_ARC4_C)
+            || ( ssl->conf->arc4_disabled &&
+                suite_info->cipher == MBEDTLS_CIPHER_ARC4_128 )
+#endif
+        )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad server hello message" ) );
         return( MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO );
     }
 
-
     i = 0;
     while( 1 )
     {