From 91cadee01e4571398489c861eddc43a70b20b7c1 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 2 Mar 2015 13:43:09 +0000
Subject: Fix a minor information leak that was introduced in t1_lib.c r1.71,
 whereby an additional 28 bytes of .rodata (or .data) is provided to the
 network. In most cases this is a non-issue since the memory content is
 already public.

Issue found and reported by Felix Groebert of the Google Security Team.

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

diff --git a/src/lib/libssl/src/ssl/t1_lib.c b/src/lib/libssl/src/ssl/t1_lib.c
index 60cef857b5..9b7f54682b 100644
--- a/src/lib/libssl/src/ssl/t1_lib.c
+++ b/src/lib/libssl/src/ssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.74 2014/12/14 14:34:43 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.75 2015/03/02 13:43:09 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -395,7 +395,7 @@ tls1_get_curvelist(SSL *s, int client_curves, const uint16_t **pcurves,
 	*pcurveslen = s->tlsext_ellipticcurvelist_length;
 	if (*pcurves == NULL) {
 		*pcurves = eccurves_default;
-		*pcurveslen = sizeof(eccurves_default);
+		*pcurveslen = sizeof(eccurves_default) / 2;
 	}
 }
 
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 60cef857b5..9b7f54682b 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.74 2014/12/14 14:34:43 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.75 2015/03/02 13:43:09 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -395,7 +395,7 @@ tls1_get_curvelist(SSL *s, int client_curves, const uint16_t **pcurves,
 	*pcurveslen = s->tlsext_ellipticcurvelist_length;
 	if (*pcurves == NULL) {
 		*pcurves = eccurves_default;
-		*pcurveslen = sizeof(eccurves_default);
+		*pcurveslen = sizeof(eccurves_default) / 2;
 	}
 }
 
-- 
cgit v1.2.3-55-g6feb