commit 1cf7b30dc80d351f7143debc8b50abc9f8a4eae9
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jun 24 22:28:19 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Thu Jun 25 10:59:56 2015 +0200
tree 0ce2369e2b70bdec0c91db58dbd94a78493f9245
parent db5d15e22708f119f08cda4223f15fd8d94af7b7

Rewrite test to make Coverity happier

With the default config, it noticed the accept_comp was always 0, so the rest
of the test was dead code.

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 9e2b0ad..661af12 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1147,7 +1147,10 @@
     size_t n;
     size_t ext_len;
     unsigned char *buf, *ext;
-    unsigned char comp, accept_comp;
+    unsigned char comp;
+#if defined(MBEDTLS_ZLIB_SUPPORT)
+    int accept_comp;
+#endif
 #if defined(MBEDTLS_SSL_RENEGOTIATION)
     int renegotiation_info_seen = 0;
 #endif
@@ -1302,19 +1305,19 @@
     comp = buf[37 + n];
 
 #if defined(MBEDTLS_ZLIB_SUPPORT)
-    accept_comp = 1;
-#else
-    accept_comp = 0;
-#endif
-
     /* See comments in ssl_write_client_hello() */
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
     if( ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM )
         accept_comp = 0;
+    else
 #endif
+        accept_comp = 1;
 
-    if( ( accept_comp == 0 && comp != MBEDTLS_SSL_COMPRESS_NULL ) ||
-        ( comp != MBEDTLS_SSL_COMPRESS_NULL && comp != MBEDTLS_SSL_COMPRESS_DEFLATE ) )
+    if( comp != MBEDTLS_SSL_COMPRESS_NULL &&
+        ( comp != MBEDTLS_SSL_COMPRESS_DEFLATE || accept_comp == 0 ) )
+#else /* MBEDTLS_ZLIB_SUPPORT */
+    if( comp != MBEDTLS_SSL_COMPRESS_NULL )
+#endif/* MBEDTLS_ZLIB_SUPPORT */
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "server hello, bad compression: %d", comp ) );
         return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );