From 90d37d3c78a6848be337bcc7eaaaad0764c52d80 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Tue, 8 Jul 2014 16:05:52 +0000
Subject: pedantic avoidance of division by zero, likely not actually possible
 to hit for real. ok miod@ jsing@

---
 src/lib/libssl/src/ssl/t1_enc.c | 7 ++++++-
 src/lib/libssl/t1_enc.c         | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c
index 373c2d0060..46238dc6c3 100644
--- a/src/lib/libssl/src/ssl/t1_enc.c
+++ b/src/lib/libssl/src/ssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.63 2014/06/21 17:02:25 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.64 2014/07/08 16:05:52 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -251,6 +251,11 @@ tls1_PRF(long digest_mask, const void *seed1, int seed1_len, const void *seed2,
 		if ((m << TLS1_PRF_DGST_SHIFT) & digest_mask)
 			count++;
 	}
+	if (count == 0) {
+		SSLerr(SSL_F_TLS1_PRF,
+		    SSL_R_SSL_HANDSHAKE_FAILURE);
+		goto err;
+	}
 	len = slen / count;
 	if (count == 1)
 		slen = 0;
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 373c2d0060..46238dc6c3 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_enc.c,v 1.63 2014/06/21 17:02:25 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.64 2014/07/08 16:05:52 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -251,6 +251,11 @@ tls1_PRF(long digest_mask, const void *seed1, int seed1_len, const void *seed2,
 		if ((m << TLS1_PRF_DGST_SHIFT) & digest_mask)
 			count++;
 	}
+	if (count == 0) {
+		SSLerr(SSL_F_TLS1_PRF,
+		    SSL_R_SSL_HANDSHAKE_FAILURE);
+		goto err;
+	}
 	len = slen / count;
 	if (count == 1)
 		slen = 0;
-- 
cgit v1.2.3-55-g6feb