summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2015-10-08 22:00:27 +0200
committerRichard Levitte <levitte@openssl.org>2015-10-23 20:47:53 +0200
commit200c8ed4f5dd5fce21a3688c2f41d474a3aceca4 (patch)
tree5d4aef79d5df1c6b4a392ef4a04c3b5ea922d042 /ssl
parenta5524e534b22fa6fbba53dddb6a5543371a66a03 (diff)
Remove useless code
RT#4081 Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 070c23325af4526c9a8532a60d63522c58d5554b)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_clnt.c1
-rw-r--r--ssl/s3_srvr.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index e5f0fee057..104349ee49 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -3218,7 +3218,6 @@ int ssl3_send_client_certificate(SSL *s)
* If we get an error, we need to ssl->rwstate=SSL_X509_LOOKUP;
* return(-1); We then get retied later
*/
- i = 0;
i = ssl_do_client_cert_cb(s, &x509, &pkey);
if (i < 0) {
s->rwstate = SSL_X509_LOOKUP;
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 208063cf74..aa57937115 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -383,7 +383,6 @@ int ssl3_accept(SSL *s)
*/
if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)
SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_CLIENTHELLO_TLSEXT);
- ret = SSL_TLSEXT_ERR_ALERT_FATAL;
ret = -1;
s->state = SSL_ST_ERR;
goto end;