commit c6ef15c494e49ecc505156c8063474b20e29ef6a
author Richard Levitte <levitte@openssl.org> Thu Jan 29 01:54:09 2015 +0100
committer Richard Levitte <levitte@openssl.org> Thu Jan 29 01:54:09 2015 +0100
tree accf01dca71f3c74a0c60aa879645cae8d99c2e4
parent 7317192c645f24dfdb0c8340b871bc045454f8f4

clang on Linux x86_64 complains about unreachable code.

Reviewed-by: Rich Salz <rsalz@openssl.org>

ssl/s3_lib.c

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index b85d9bf..7a07a24 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3434,7 +3434,6 @@
             SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (ret);
         }
-        break;
 #endif
 #ifndef OPENSSL_NO_DH
     case SSL_CTRL_SET_TMP_DH:
@@ -3471,7 +3470,6 @@
             SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (ret);
         }
-        break;
     case SSL_CTRL_SET_DH_AUTO:
         s->cert->dh_tmp_auto = larg;
         return 1;
@@ -3508,7 +3506,6 @@
             SSLerr(SSL_F_SSL3_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (ret);
         }
-        break;
 #endif                          /* !OPENSSL_NO_ECDH */
 #ifndef OPENSSL_NO_TLSEXT
     case SSL_CTRL_SET_TLSEXT_HOSTNAME:
@@ -3927,7 +3924,6 @@
             SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (0);
         }
-        break;
 #endif
 #ifndef OPENSSL_NO_DH
     case SSL_CTRL_SET_TMP_DH:
@@ -3964,7 +3960,6 @@
             SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (0);
         }
-        break;
     case SSL_CTRL_SET_DH_AUTO:
         ctx->cert->dh_tmp_auto = larg;
         return 1;
@@ -4003,7 +3998,6 @@
             SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
             return (0);
         }
-        break;
 #endif                          /* !OPENSSL_NO_ECDH */
 #ifndef OPENSSL_NO_TLSEXT
     case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:
@@ -4034,7 +4028,6 @@
     case SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG:
         ctx->tlsext_status_arg = parg;
         return 1;
-        break;
 
 # ifndef OPENSSL_NO_SRP
     case SSL_CTRL_SET_TLS_EXT_SRP_USERNAME:

ssl/ssl_rsa.c

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index d046020..723da6e 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -798,7 +798,7 @@
         serverinfo += len;
         serverinfo_length -= len;
     }
-    return 0;                   /* Error */
+    /* Unreachable */
 }
 
 static int serverinfo_srv_parse_cb(SSL *s, unsigned int ext_type,

ssl/ssltest.c

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index b90f6fb..fb78aea 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1771,7 +1771,6 @@
     if (bio_err != NULL)
         BIO_free(bio_err);
     EXIT(ret);
-    return ret;
 }
 
 int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,