diff options
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 7 | ||||
| -rw-r--r-- | ssl/ssl_rsa.c | 2 | ||||
| -rw-r--r-- | ssl/ssltest.c | 1 |
3 files changed, 1 insertions, 9 deletions
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 @@ 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 d046020..723da6e 100644 --- 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 b90f6fb..fb78aea 100644 --- 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, |