Date: Tue, 12 Jun 2018 14:18:39 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r472255 - in branches/2018Q2/security/openssl-devel: . files Message-ID: <201806121418.w5CEIdct022376@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Tue Jun 12 14:18:39 2018 New Revision: 472255 URL: https://svnweb.freebsd.org/changeset/ports/472255 Log: MFH: r472247 security/openssl-devel: Security update - Upstream update for CVE-2018-0732 Security: c82ecac5-6e3f-11e8-8777-b499baebfeaf Approved by: ports-secteam (miwi) Added: branches/2018Q2/security/openssl-devel/files/patch-CVE-2018-0732 - copied unchanged from r472247, head/security/openssl-devel/files/patch-CVE-2018-0732 Modified: branches/2018Q2/security/openssl-devel/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/security/openssl-devel/Makefile ============================================================================== --- branches/2018Q2/security/openssl-devel/Makefile Tue Jun 12 14:17:10 2018 (r472254) +++ branches/2018Q2/security/openssl-devel/Makefile Tue Jun 12 14:18:39 2018 (r472255) @@ -3,7 +3,7 @@ PORTNAME= openssl PORTVERSION= 1.1.0h -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/ @@ -23,7 +23,7 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config CONFIGURE_ENV= PERL="${PERL}" CONFIGURE_ARGS= --openssldir=${OPENSSLDIR} \ - --prefix=${PREFIX} + --prefix=${PREFIX} -v OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS OPTIONS_GROUP_CIPHERS= IDEA JPAKE RC2 RC4 RC5 Copied: branches/2018Q2/security/openssl-devel/files/patch-CVE-2018-0732 (from r472247, head/security/openssl-devel/files/patch-CVE-2018-0732) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/security/openssl-devel/files/patch-CVE-2018-0732 Tue Jun 12 14:18:39 2018 (r472255, copy of r472247, head/security/openssl-devel/files/patch-CVE-2018-0732) @@ -0,0 +1,39 @@ +From ea7abeeabf92b7aca160bdd0208636d4da69f4f4 Mon Sep 17 00:00:00 2001 +From: Guido Vranken <guidovranken@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@gmail.com> + +(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) + +Reviewed-by: Tim Hudson <tjh@openssl.org> +Reviewed-by: Matt Caswell <matt@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 fce9ff47f36..58003d70878 100644 +--- crypto/dh/dh_key.c.orig ++++ crypto/dh/dh_key.c +@@ -78,10 +78,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806121418.w5CEIdct022376>