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

[Bernard Spil]

Author: brnrd
Date: Wed Apr 18 19:47:50 2018
New Revision: 467730
URL: https://svnweb.freebsd.org/changeset/ports/467730

Log:
  MFH: r467495 r467498
  
  security/openssl: Security update
  
   - Add CVE-2018-0737 patch
   - Bump portrev too
  
  Security:	8f353420-4197-11e8-8777-b499baebfeaf
  Approved by:	ports-secteam (riggs)

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

Modified: branches/2018Q2/security/openssl/Makefile
==============================================================================
--- branches/2018Q2/security/openssl/Makefile	Wed Apr 18 19:45:55 2018	(r467729)
+++ branches/2018Q2/security/openssl/Makefile	Wed Apr 18 19:47:50 2018	(r467730)
@@ -3,6 +3,7 @@
 
 PORTNAME=	openssl
 PORTVERSION=	1.0.2o
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.openssl.org/source/ \

Copied: branches/2018Q2/security/openssl/files/patch-CVE-2018-0737 (from r467498, head/security/openssl/files/patch-CVE-2018-0737)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/security/openssl/files/patch-CVE-2018-0737	Wed Apr 18 19:47:50 2018	(r467730, copy of r467498, head/security/openssl/files/patch-CVE-2018-0737)
@@ -0,0 +1,28 @@
+From 349a41da1ad88ad87825414752a8ff5fdd6a6c3f Mon Sep 17 00:00:00 2001
+From: Billy Brumley <bbrumley at gmail.com>
+Date: Wed, 11 Apr 2018 10:10:58 +0300
+Subject: [PATCH] RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont
+ both get called with BN_FLG_CONSTTIME flag set.
+
+CVE-2018-0737
+
+Reviewed-by: Rich Salz <rsalz at openssl.org>
+Reviewed-by: Matt Caswell <matt at openssl.org>
+(cherry picked from commit 6939eab03a6e23d2bd2c3f5e34fe1d48e542e787)
+---
+ crypto/rsa/rsa_gen.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
+index 9ca5dfefb70..42b89a8dfaa 100644
+--- crypto/rsa/rsa_gen.c.orig
++++ crypto/rsa/rsa_gen.c
+@@ -156,6 +156,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value,
+     if (BN_copy(rsa->e, e_value) == NULL)
+         goto err;
+ 
++    BN_set_flags(rsa->p, BN_FLG_CONSTTIME);
++    BN_set_flags(rsa->q, BN_FLG_CONSTTIME);
+     BN_set_flags(r2, BN_FLG_CONSTTIME);
+     /* generate p and q */
+     for (;;) {