clang on Linux x86_64 complains about unreachable code.

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

diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 0de46f008d2d7f8cd4dbc7ae32e7ab1d9804f3d1..3c06930ce60451fb0fcbeda59abe457728f4a3a6 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -892,7 +892,6 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass,
         i2a_ASN1_OBJECT(bio_err, bag->type);
         BIO_printf(bio_err, "\n");
         return 1;
-        break;
     }
     return 1;
 }

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 87066e83746a1e5eff2fcf29f72794ba3ef6ba7c..9735cb5b455c80593016434a91493d9629ed38a5 100644 (file)
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -419,7 +419,6 @@ static int parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
             ASN1err(ASN1_F_PARSE_TAGGING, ASN1_R_INVALID_MODIFIER);
             ERR_add_error_data(2, "Char=", erch);
             return 0;
-            break;
 
         }
     } else
@@ -769,7 +768,6 @@ static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
     default:
         ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_UNSUPPORTED_TYPE);
         goto bad_str;
-        break;
     }
 
     atmp->type = utype;

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 7aae022e85015bed4b583ee852ca20426f398dd2..97e5b34579a70e5ea5bead59aebdc2b771730247 100644 (file)
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -246,7 +246,6 @@ static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
         case NID_id_GostR3411_94:
             BIO_puts(out, "gostr3411-94");
             goto err;
-            break;
 
         default:
             if (have_unknown)

diff --git a/crypto/asn1/bio_asn1.c b/crypto/asn1/bio_asn1.c
index 60189b3b2c535b07e2aa6977ffc71b4becc8c157..0b4fd1dd9e73ef2521d94cd5e9079e9e3c97a2cb 100644 (file)
--- a/crypto/asn1/bio_asn1.c
+++ b/crypto/asn1/bio_asn1.c
@@ -422,7 +422,6 @@ static long asn1_bio_ctrl(BIO *b, int cmd, long arg1, void *arg2)
             BIO_clear_retry_flags(b);
             return 0;
         }
-        break;
 
     default:
         if (!b->next_bio)

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index 4595664409c9b91118e0ac0dee35ddfc670edfe3..abdeba4ce4300ca0de38d94cca97a4bee90eb5bb 100644 (file)
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -206,7 +206,6 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         }
         return asn1_d2i_ex_primitive(pval, in, len, it,
                                      tag, aclass, opt, ctx);
-        break;
 
     case ASN1_ITYPE_MSTRING:
         p = *in;

diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c
index f04a6892a8d9fe14f681f4dbadbbf5fedb4b39ba..bc9429c89ac989a78a45fedb6c9ca92387a33aeb 100644 (file)
--- a/crypto/asn1/tasn_enc.c
+++ b/crypto/asn1/tasn_enc.c
@@ -147,7 +147,6 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
             return asn1_template_ex_i2d(pval, out, it->templates,
                                         tag, aclass);
         return asn1_i2d_ex_primitive(pval, out, it, tag, aclass);
-        break;
 
     case ASN1_ITYPE_MSTRING:
         return asn1_i2d_ex_primitive(pval, out, it, -1, aclass);
@@ -608,7 +607,6 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
     case V_ASN1_BIT_STRING:
         return i2c_ASN1_BIT_STRING((ASN1_BIT_STRING *)*pval,
                                    cout ? &cout : NULL);
-        break;
 
     case V_ASN1_INTEGER:
     case V_ASN1_NEG_INTEGER:
@@ -618,7 +616,6 @@ int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cout, int *putype,
          * These are all have the same content format as ASN1_INTEGER
          */
         return i2c_ASN1_INTEGER((ASN1_INTEGER *)*pval, cout ? &cout : NULL);
-        break;
 
     case V_ASN1_OCTET_STRING:
     case V_ASN1_NUMERICSTRING:

diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c
index 0b008f091cbfc42aa114adbc50a7e276c9c6dc15..e581bf50ab6b8d45b2e81fc6b5eb318b58d5adcc 100644 (file)
--- a/crypto/bf/bftest.c
+++ b/crypto/bf/bftest.c
@@ -294,7 +294,6 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", ret);
 # endif
     EXIT(ret);
-    return (0);
 }
 
 static int print_test_data(void)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 885b969e057036bdd7dcd36e79e93991b7fcff74..737359722aaef6f227474263c42c9859f3df6474 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -686,7 +686,6 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
     case BIO_CTRL_DGRAM_GET_MTU:
         return data->mtu;
-        break;
     case BIO_CTRL_DGRAM_SET_MTU:
         data->mtu = num;
         ret = num;

diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index e03c808554db803b3b456d8d52952ea55e1f5e46..4d109d8935e99aa84916e7725267bbb58837a93b 100644 (file)
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -353,7 +353,6 @@ int main(int argc, char *argv[])
     ERR_load_crypto_strings();
     ERR_print_errors_fp(stderr);
     EXIT(1);
-    return (1);
 }
 
 int test_add(BIO *bp)

diff --git a/crypto/bn/exptest.c b/crypto/bn/exptest.c
index bf96c5ba528611e2f65d2e99e73d26e28ac56185..2da8dc2ffe9564beb242a9cb6a454ef470ef6829 100644 (file)
--- a/crypto/bn/exptest.c
+++ b/crypto/bn/exptest.c
@@ -254,5 +254,4 @@ int main(int argc, char *argv[])
     printf("ERROR\n");
 #endif
     EXIT(1);
-    return (1);
 }

diff --git a/crypto/cast/casttest.c b/crypto/cast/casttest.c
index dc31bc6604a80876283895f20dbd42ab4e409402..9c6614bc8bfcaaec2d7fc59573b49807c9037ff4 100644 (file)
--- a/crypto/cast/casttest.c
+++ b/crypto/cast/casttest.c
@@ -236,6 +236,5 @@ int main(int argc, char *argv[])
 # endif
 
     EXIT(err);
-    return (err);
 }
 #endif

diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c
index 93c06cb00a8f370bd313297a0ae0a07a23eb99df..624c3f268f776fcf0bd15901e2313507c6b4a994 100644 (file)
--- a/crypto/cms/cms_env.c
+++ b/crypto/cms/cms_env.c
@@ -832,11 +832,9 @@ int CMS_RecipientInfo_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri)
 
     case CMS_RECIPINFO_KEK:
         return cms_RecipientInfo_kekri_encrypt(cms, ri);
-        break;
 
     case CMS_RECIPINFO_PASS:
         return cms_RecipientInfo_pwri_crypt(cms, ri, 1);
-        break;
 
     default:
         CMSerr(CMS_F_CMS_RECIPIENTINFO_ENCRYPT,

diff --git a/crypto/dh/dhtest.c b/crypto/dh/dhtest.c
index 988322a70335640999ca7e1be062fb115b1e24c8..9bb9a0021280e2bd8388bd14f523e7493b18707b 100644 (file)
--- a/crypto/dh/dhtest.c
+++ b/crypto/dh/dhtest.c
@@ -211,7 +211,6 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", ret);
 # endif
     EXIT(ret);
-    return (ret);
 }
 
 static int cb(int p, int n, BN_GENCB *arg)

diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c
index ed3b24a3f6390f2bc43da101be9d4c99f422b3d0..9b1308926f92d5ad819548b7e0ef6a414cc8ba50 100644 (file)
--- a/crypto/dsa/dsatest.c
+++ b/crypto/dsa/dsatest.c
@@ -228,7 +228,6 @@ int main(int argc, char **argv)
         printf("ERROR\n");
 # endif
     EXIT(!ret);
-    return (0);
 }
 
 static int dsa_cb(int p, int n, BN_GENCB *arg)

diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c
index 04b0cf30d09bd3c9cc26266ae61965ca8f9af9c0..5aed2b124b84d67d4b1c746031fe1934abb0efec 100644 (file)
--- a/crypto/ecdh/ecdhtest.c
+++ b/crypto/ecdh/ecdhtest.c
@@ -543,7 +543,6 @@ int main(int argc, char *argv[])
     ERR_remove_thread_state(NULL);
     CRYPTO_mem_leaks_fp(stderr);
     EXIT(ret);
-    return (ret);
 }
 
 # if 0

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 111351852e278f9249d60164b0409a707c03139f..3d40b0481bfd545939044aa91535d6741c805e5d 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -227,7 +227,6 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
 
         default:
             return 0;
-            break;
         }
     }
 

diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 6a456297bc15baa34bfae2411828036b832e22aa..52c9a8690f9db3de4b4af5db7a534647dbaaefb2 100644 (file)
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -152,13 +152,11 @@ PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken)
     case PKCS8_OK:
         p8->broken = PKCS8_OK;
         return p8;
-        break;
 
     case PKCS8_NO_OCTET:
         p8->broken = PKCS8_NO_OCTET;
         p8->pkey->type = V_ASN1_SEQUENCE;
         return p8;
-        break;
 
     default:
         EVPerr(EVP_F_PKCS8_SET_BROKEN, EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE);

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index 597b9fe23ca05cba9a03670f1e01f13fd8d0f6e9..b356131d6400ff24c5bbc98f6fd2483bf2950a6c 100644 (file)
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -126,7 +126,6 @@ static unsigned char *ustrsep(char **p, const char *sep)
 static int test1_exit(int ec)
 {
     EXIT(ec);
-    return (0);                 /* To keep some compilers quiet */
 }
 
 /* Test copying of contexts */

diff --git a/crypto/hmac/hmactest.c b/crypto/hmac/hmactest.c
index 3d130a03ed069c49df7e1efbd4464ef7a70f9bce..492f5c5e81a7f40bd6764bd39516cc9506c05ae6 100644 (file)
--- a/crypto/hmac/hmactest.c
+++ b/crypto/hmac/hmactest.c
@@ -150,7 +150,6 @@ int main(int argc, char *argv[])
     }
 # endif                         /* OPENSSL_NO_MD5 */
     EXIT(err);
-    return (0);
 }
 
 # ifndef OPENSSL_NO_MD5

diff --git a/crypto/idea/ideatest.c b/crypto/idea/ideatest.c
index a967dd58a7ae255c2aef33dc62ed62dc93301506..dd5d9ff12f045e2bd61015476b2a196591c0ada6 100644 (file)
--- a/crypto/idea/ideatest.c
+++ b/crypto/idea/ideatest.c
@@ -173,7 +173,6 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", err);
 # endif
     EXIT(err);
-    return (err);
 }
 
 static int cfb64_test(unsigned char *cfb_cipher)

diff --git a/crypto/md4/md4test.c b/crypto/md4/md4test.c
index 59f23bb5d6c2cbf8a221de101691883a5d29ab93..9c82eb07f80d59f8e99680feed760deb0c869257 100644 (file)
--- a/crypto/md4/md4test.c
+++ b/crypto/md4/md4test.c
@@ -118,7 +118,6 @@ int main(int argc, char *argv[])
         P++;
     }
     EXIT(err);
-    return (0);
 }
 
 static char *pt(unsigned char *md)

diff --git a/crypto/md5/md5test.c b/crypto/md5/md5test.c
index 0d0ab2d7d141c161c0b5746b0f38d6c3f7cf8776..3016ee39d54f50c5f2dd618d415bdc05f8dfa24c 100644 (file)
--- a/crypto/md5/md5test.c
+++ b/crypto/md5/md5test.c
@@ -123,7 +123,6 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", err);
 # endif
     EXIT(err);
-    return (0);
 }
 
 static char *pt(unsigned char *md)

diff --git a/crypto/mdc2/mdc2test.c b/crypto/mdc2/mdc2test.c
index 8416252f8005004c08bccaf1283f3d4dc23829c2..a0d77a30ecf20a36da04844e11a3b32189a95f63 100644 (file)
--- a/crypto/mdc2/mdc2test.c
+++ b/crypto/mdc2/mdc2test.c
@@ -141,6 +141,5 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", ret);
 # endif
     EXIT(ret);
-    return (ret);
 }
 #endif

diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
index 446882d35fc5e41806e02169ba8e784d41100b99..aca0d48879f71324890fba86065ec64434d6b7bd 100644 (file)
--- a/crypto/ocsp/ocsp_ht.c
+++ b/crypto/ocsp/ocsp_ht.c
@@ -508,8 +508,6 @@ int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx)
         rctx->state = OHS_DONE;
         return 1;
 
-        break;
-
     case OHS_DONE:
         return 1;
 

diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index ee476c38f4a733102cbb3b650e89766b639cde76..4fd8b8c2294f58eeb01334d443f66f8735b4038f 100644 (file)
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -287,11 +287,9 @@ static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
 
     case NID_safeContentsBag:
         return parse_bags(bag->value.safes, pass, passlen, pkey, ocerts);
-        break;
 
     default:
         return 1;
-        break;
     }
     return 1;
 }

diff --git a/crypto/rand/randtest.c b/crypto/rand/randtest.c
index 3c2628cb1574ea7c3f103120e3720e375a6c1bba..267752e4f554ae4a778fab07bad18ba716f075cd 100644 (file)
--- a/crypto/rand/randtest.c
+++ b/crypto/rand/randtest.c
@@ -195,5 +195,4 @@ int main(int argc, char **argv)
         printf("ERROR: %d\n", err);
 #endif
     EXIT(err);
-    return (err);
 }

diff --git a/crypto/rc2/rc2test.c b/crypto/rc2/rc2test.c
index f7eae13c264143bbba0736b6fef54537db1506ef..ae57e56d39f041e82e22775fc9b5c9f297e90e06 100644 (file)
--- a/crypto/rc2/rc2test.c
+++ b/crypto/rc2/rc2test.c
@@ -147,7 +147,6 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", err);
 # endif
     EXIT(err);
-    return (err);
 }
 
 #endif

diff --git a/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c
index e2bfbfa1fcb5ad7c075ddfe87113753c0bc1cf51..a1f96e4cb8135eaf5a05354134f438c8c7425739 100644 (file)
--- a/crypto/rc4/rc4test.c
+++ b/crypto/rc4/rc4test.c
@@ -230,6 +230,5 @@ int main(int argc, char *argv[])
         printf("ERROR: %d\n", err);
 # endif
     EXIT(err);
-    return (0);
 }
 #endif

diff --git a/crypto/ripemd/rmdtest.c b/crypto/ripemd/rmdtest.c
index 86054c7b82323ab691ffed319601360d6b274805..b0ebb12c2778903f5656ff0a9d14fb63bd8df1f2 100644 (file)
--- a/crypto/ripemd/rmdtest.c
+++ b/crypto/ripemd/rmdtest.c
@@ -128,7 +128,6 @@ int main(int argc, char *argv[])
         P++;
     }
     EXIT(err);
-    return (0);
 }
 
 static char *pt(unsigned char *md)

diff --git a/crypto/x509v3/pcy_tree.c b/crypto/x509v3/pcy_tree.c
index 8d02092cdee2fa99012a6df5aadb549178594e64..d4b550e4cfdd2b2bf512edcb7eb2944532f0e0cd 100644 (file)
--- a/crypto/x509v3/pcy_tree.c
+++ b/crypto/x509v3/pcy_tree.c
@@ -530,7 +530,7 @@ static int tree_prune(X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr)
         }
     }
 
-    return 1;
+    /* Unreachable */
 
 }
 

diff --git a/engines/ccgost/gost_ameth.c b/engines/ccgost/gost_ameth.c
index fc4d2e2c68d852dcaea3aee27605bbec0b32d38a..ad8480daadb8cfef0ed974fb1debbdc48ae8d5ac 100644 (file)
--- a/engines/ccgost/gost_ameth.c
+++ b/engines/ccgost/gost_ameth.c
@@ -189,7 +189,6 @@ BIGNUM *gost_get0_priv_key(const EVP_PKEY *pkey)
             if (!dsa->priv_key)
                 return NULL;
             return dsa->priv_key;
-            break;
         }
     case NID_id_GostR3410_2001:
         {
@@ -201,7 +200,6 @@ BIGNUM *gost_get0_priv_key(const EVP_PKEY *pkey)
             if (!(priv = EC_KEY_get0_private_key(ec)))
                 return NULL;
             return (BIGNUM *)priv;
-            break;
         }
     }
     return NULL;

diff --git a/engines/ccgost/gost_pmeth.c b/engines/ccgost/gost_pmeth.c
index eb63d425c07ddb9f270a8922a721276c79917942..f1220e8ccd141a8e5e2ea26dbfaa9327e0040f7e 100644 (file)
--- a/engines/ccgost/gost_pmeth.c
+++ b/engines/ccgost/gost_pmeth.c
@@ -86,7 +86,6 @@ static int pkey_gost_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             pctx->md = (EVP_MD *)p2;
             return 1;
         }
-        break;
 
     case EVP_PKEY_CTRL_GET_MD:
         *(const EVP_MD **)p2 = pctx->md;
@@ -150,7 +149,6 @@ static int pkey_gost_ctrl94_str(EVP_PKEY_CTX *ctx,
                 break;
             default:
                 return 0;
-                break;
             }
         } else if ((strlen(value) == 2)
                    && (toupper((unsigned char)value[0]) == 'X')) {
@@ -166,7 +164,6 @@ static int pkey_gost_ctrl94_str(EVP_PKEY_CTX *ctx,
                 break;
             default:
                 return 0;
-                break;
             }
         } else {
             R3410_params *p = R3410_paramset;
@@ -214,7 +211,6 @@ static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
                 break;
             default:
                 return 0;
-                break;
             }
         } else if ((strlen(value) == 2)
                    && (toupper((unsigned char)value[0]) == 'X')) {
@@ -227,7 +223,6 @@ static int pkey_gost_ctrl01_str(EVP_PKEY_CTX *ctx,
                 break;
             default:
                 return 0;
-                break;
             }
         } else {
             R3410_2001_params *p = R3410_2001_paramset;
@@ -454,7 +449,6 @@ static int pkey_gost_mac_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
             data->md = (EVP_MD *)p2;
             return 1;
         }
-        break;
 
     case EVP_PKEY_CTRL_GET_MD:
         *(const EVP_MD **)p2 = data->md;

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index b85d9bf8e35b97f151ff2329ebb2aa8c3d3ea725..7a07a2446420bcb486519416af6004fd019ee0e3 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3434,7 +3434,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             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 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             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 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
             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 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
             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 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
             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 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
             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 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
     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:

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

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index b90f6fb28040ed47802124882e4a6d9eda214ec1..fb78aeaf9c230e0f001ed74e397ffb4039cf5ffa 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1771,7 +1771,6 @@ int main(int argc, char *argv[])
     if (bio_err != NULL)
         BIO_free(bio_err);
     EXIT(ret);
-    return ret;
 }
 
 int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count,