From 3b7c7cd9a90549e08ba969aff5209813121c459e Mon Sep 17 00:00:00 2001
From: doug <>
Date: Tue, 21 Jul 2015 03:34:38 +0000
Subject: Remove duplicate check in libssl.

If len == 0, it already set try_session_cache so there's no need to
check len again.  Fixes Coverity issue 21687.

ok bcook@
---
 src/lib/libssl/src/ssl/ssl_sess.c | 4 +---
 src/lib/libssl/ssl_sess.c         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/lib/libssl/src/ssl/ssl_sess.c b/src/lib/libssl/src/ssl/ssl_sess.c
index 80b883f786..ef5b9be56d 100644
--- a/src/lib/libssl/src/ssl/ssl_sess.c
+++ b/src/lib/libssl/src/ssl/ssl_sess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sess.c,v 1.44 2014/12/14 15:30:50 jsing Exp $ */
+/* $OpenBSD: ssl_sess.c,v 1.45 2015/07/21 03:34:38 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -452,8 +452,6 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
 		SSL_SESSION data;
 		data.ssl_version = s->version;
 		data.session_id_length = len;
-		if (len == 0)
-			return 0;
 		memcpy(data.session_id, session_id, len);
 
 		CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c
index 80b883f786..ef5b9be56d 100644
--- a/src/lib/libssl/ssl_sess.c
+++ b/src/lib/libssl/ssl_sess.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_sess.c,v 1.44 2014/12/14 15:30:50 jsing Exp $ */
+/* $OpenBSD: ssl_sess.c,v 1.45 2015/07/21 03:34:38 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -452,8 +452,6 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
 		SSL_SESSION data;
 		data.ssl_version = s->version;
 		data.session_id_length = len;
-		if (len == 0)
-			return 0;
 		memcpy(data.session_id, session_id, len);
 
 		CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
-- 
cgit v1.2.3-55-g6feb