From f6faa42a2e718b5331e22139845d05acd06ceb7e Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 24 Aug 2018 20:30:21 +0000
Subject: Let SSL_copy_session_id() return an int for error checking.

Accordingly, add some error checking to SSL_copy_session_id(),
BIO_ssl_copy_session_id(), and SSL_dup().
Prompted by OpenSSL commit 17dd65e6e1f

Tested in a bulk build by sthen

ok jsing
---
 src/lib/libssl/bio_ssl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/bio_ssl.c')

diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index d68e011c62..93cfa0d2a4 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_ssl.c,v 1.28 2018/05/01 13:30:24 tb Exp $ */
+/* $OpenBSD: bio_ssl.c,v 1.29 2018/08/24 20:30:21 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -568,7 +568,9 @@ BIO_ssl_copy_session_id(BIO *t, BIO *f)
 	if ((((BIO_SSL *)t->ptr)->ssl == NULL) ||
 	    (((BIO_SSL *)f->ptr)->ssl == NULL))
 		return (0);
-	SSL_copy_session_id(((BIO_SSL *)t->ptr)->ssl, ((BIO_SSL *)f->ptr)->ssl);
+	if (!SSL_copy_session_id(((BIO_SSL *)t->ptr)->ssl,
+	    ((BIO_SSL *)f->ptr)->ssl))
+		return (0);
 	return (1);
 }
 
-- 
cgit v1.2.3-55-g6feb