From: Matt Caswell <matt@openssl.org>
Date: Fri, 6 Nov 2015 09:54:39 +0000 (+0000)
Subject: Remove some redundant assignments
X-Git-Tag: OpenSSL_1_1_0-pre1~301
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d16c58fa4d4ef1d6394c2a6ad5ca93c095808e6;p=oweals%2Fopenssl.git

Remove some redundant assignments

We were setting |s->renegotiate| and |s->new_session| to 0 twice in
tls_finish_handshake. This is redundant so now we just do it once!

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index b0df7d2636..2f13e92111 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -405,9 +405,6 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst)
         s->new_session = 0;
 
         if (s->server) {
-            s->renegotiate = 0;
-            s->new_session = 0;
-
             ssl_update_cache(s, SSL_SESS_CACHE_SERVER);
 
             s->ctx->stats.sess_accept_good++;