From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Mon, 13 Feb 2017 12:21:34 +0000 (+0100)
Subject: Remove unnecessary memset after PR #2583 avoids accessing
X-Git-Tag: OpenSSL_1_1_1-pre1~2240
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa7e9ed3d16c7e713b67a84de9683837610cd318;p=oweals%2Fopenssl.git

Remove unnecessary memset after PR #2583 avoids accessing
the uninitialized session_id now.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2608)
---

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index ddd949d4b4..be3c4c3526 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -501,7 +501,6 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello, int *al)
         SSL_SESSION data;
 
         data.ssl_version = s->version;
-        memset(data.session_id, 0, sizeof(data.session_id));
         memcpy(data.session_id, hello->session_id, hello->session_id_len);
         data.session_id_length = hello->session_id_len;