svn commit: r472254 - in branches/2018Q2/security/openssl: . files

[Bernard Spil]

Author: brnrd
Date: Tue Jun 12 14:17:10 2018
New Revision: 472254
URL: https://svnweb.freebsd.org/changeset/ports/472254

Log:
  MFH: r472245
  
  security/openssl: Actually add patch file
  
  Security:	c82ecac5-6e3f-11e8-8777-b499baebfeaf
  
  Approved by:	ports-secteam (miwi)

Added:
  branches/2018Q2/security/openssl/files/patch-CVE-2018-0732
     - copied unchanged from r472245, head/security/openssl/files/patch-CVE-2018-0732
Modified:
  branches/2018Q2/security/openssl/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/security/openssl/Makefile
==============================================================================
--- branches/2018Q2/security/openssl/Makefile	Tue Jun 12 14:06:25 2018	(r472253)
+++ branches/2018Q2/security/openssl/Makefile	Tue Jun 12 14:17:10 2018	(r472254)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.2o
-PORTREVISION=	2
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \

Copied: branches/2018Q2/security/openssl/files/patch-CVE-2018-0732 (from r472245, head/security/openssl/files/patch-CVE-2018-0732)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/security/openssl/files/patch-CVE-2018-0732	Tue Jun 12 14:17:10 2018	(r472254, copy of r472245, head/security/openssl/files/patch-CVE-2018-0732)
@@ -0,0 +1,39 @@
+From 3984ef0b72831da8b3ece4745cac4f8575b19098 Mon Sep 17 00:00:00 2001
+From: Guido Vranken <guidovranken at gmail.com>
+Date: Mon, 11 Jun 2018 19:38:54 +0200
+Subject: [PATCH] Reject excessively large primes in DH key generation.
+
+CVE-2018-0732
+
+Signed-off-by: Guido Vranken <guidovranken at gmail.com>
+
+(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe)
+
+Reviewed-by: Tim Hudson <tjh at openssl.org>
+Reviewed-by: Matt Caswell <matt at openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/6457)
+---
+ crypto/dh/dh_key.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c
+index 387558f1467..f235e0d682b 100644
+--- crypto/dh/dh_key.c.orig
++++ crypto/dh/dh_key.c
+@@ -130,10 +130,15 @@ static int generate_key(DH *dh)
+     int ok = 0;
+     int generate_new_key = 0;
+     unsigned l;
+-    BN_CTX *ctx;
++    BN_CTX *ctx = NULL;
+     BN_MONT_CTX *mont = NULL;
+     BIGNUM *pub_key = NULL, *priv_key = NULL;
+ 
++    if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
++        DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE);
++        return 0;
++    }
++
+     ctx = BN_CTX_new();
+     if (ctx == NULL)
+         goto err;