From nobody Mon Jul 31 20:48:30 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RF9Ly5Fwqz4pTnj; Mon, 31 Jul 2023 20:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RF9Ln3hxwz4FF0; Mon, 31 Jul 2023 20:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690836513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyphckRM3t4LSO4onK2TdGaF1q13T3Dqlj8Yvv2lwhM=; b=dAq2fdIfNeRnsPAWDw7k0+PL+Fx2vg1QLJ1QRWjxU/HCVK4OOvohW8Qo5nnp3f9K6vtBLE FSLKPTnVIfUdJyXO+S53q+edXmmK2VyVdGmh/1LghD6e5YCThMvd0UgtYFr1LVtlYfdh/G d+XvYr5RvdntYZERaBqdTXEcLI0RChJVtzFYgAtigMD5zO8ZwNjwOIunr0dUMTlGsbaQ5F 24g96pi5hyeV/DoGvmNDl8x5Ou6znYrz7oTioVWavb9Ema6glXD01czgMUX/pOZs+eIPIC fwUpqKidzWOUTyOOyn6wOn9IJOSq3CUazbQgG+BbNffClWB1J2w8qWv4GXSLcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690836513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NyphckRM3t4LSO4onK2TdGaF1q13T3Dqlj8Yvv2lwhM=; b=u2cexZ0sUrn9mU7QRpywecfuZ1pX7nZ9gd9y1dFMDLKOQ/fMG0oWAccW8cgNsq+HEx51SF UetQnNLGqvMbF14ecc76dtz5aJjDpJbuM8UMJ2dcMc5mllF2olv1/o55uKR8u+wOY9fePM J+MHU0Pt2zaHWcv1IZ+QubsufiAimrcEIQ4Mh7eOZbPiby/m+l9TCVf6tlF5tY8HQASPpO y7DTrPTRlNJT32W5ekQml/9i5pEP1l5Sg6Z8VHMpONBYXRG/EoyBT/5kUcaOYGhhCFcd9B OjO+OUEuL4pVJwyMzflxoJdpKMteSrjgoez/kboAi/2iKi3lb2BSDwhepR0Fmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690836513; a=rsa-sha256; cv=none; b=gmx2DsKJNXDJW7YNf5lBrxjEyoC+JpkSZcp9xrDuYdRkWWbJ6x4qx59tnmIVUUXOegwnlX ap/nj0KxGCxiYg6uS49ZSqjXzyO+MQws+sGtcd2q5H9qJAsABSFzy/66Jwp8TfkCQ2pP6b Fbfc9DgrQ5FUxhwwaqA51rxvFCP1YTmA64F5L9zrSx33fYTo/I8NlJHZoNrDgsI3HDQMGu viXvxCj8wTyS3FPr/cSQ3f7vLc2cNF9acv1/NuA7fviYemA5HNH7VpIja88OZzV7y6s2fJ r/0eBh7FMekOVSWo3BzOhF6j4YGZVTvnbRs8UQrrXE0CMGWMDr/pQvKTF4VJLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RF9Ln1Sptz19Dd; Mon, 31 Jul 2023 20:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VKmU78091204; Mon, 31 Jul 2023 20:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VKmUWO091203; Mon, 31 Jul 2023 20:48:30 GMT (envelope-from git) Date: Mon, 31 Jul 2023 20:48:30 GMT Message-Id: <202307312048.36VKmUWO091203@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: cf313db52dec - main - security/openssl: Security update for CVE-2023-3817 (Low) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf313db52dec29af821df18335acbe2e5cf36ba1 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf313db52dec29af821df18335acbe2e5cf36ba1 commit cf313db52dec29af821df18335acbe2e5cf36ba1 Author: Bernard Spil AuthorDate: 2023-07-31 20:47:29 +0000 Commit: Bernard Spil CommitDate: 2023-07-31 20:47:29 +0000 security/openssl: Security update for CVE-2023-3817 (Low) Security: bad6588e-2fe0-11ee-a0d1-84a93843eb75 --- security/openssl/Makefile | 1 + security/openssl/files/patch-CVE-2023-3817 | 55 ++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 958222c88b4a..d0ffd1cac2a2 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,5 +1,6 @@ PORTNAME= openssl PORTVERSION= 1.1.1u +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ diff --git a/security/openssl/files/patch-CVE-2023-3817 b/security/openssl/files/patch-CVE-2023-3817 new file mode 100644 index 000000000000..3f1d5193c73f --- /dev/null +++ b/security/openssl/files/patch-CVE-2023-3817 @@ -0,0 +1,55 @@ +From 91ddeba0f2269b017dc06c46c993a788974b1aa5 Mon Sep 17 00:00:00 2001 +From: Tomas Mraz +Date: Fri, 21 Jul 2023 11:39:41 +0200 +Subject: [PATCH] DH_check(): Do not try checking q properties if it is + obviously invalid + +If |q| >= |p| then the q value is obviously wrong as q +is supposed to be a prime divisor of p-1. + +We check if p is overly large so this added test implies that +q is not large either when performing subsequent tests using that +q value. + +Otherwise if it is too large these additional checks of the q value +such as the primality test can then trigger DoS by doing overly long +computations. + +Fixes CVE-2023-3817 + +Reviewed-by: Paul Dale +Reviewed-by: Matt Caswell +(Merged from https://github.com/openssl/openssl/pull/21551) +--- + crypto/dh/dh_check.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c +index 2001d2e7cb19..9ae96991eb4a 100644 +--- crypto/dh/dh_check.c.orig ++++ crypto/dh/dh_check.c +@@ -97,7 +97,7 @@ int DH_check_ex(const DH *dh) + + int DH_check(const DH *dh, int *ret) + { +- int ok = 0, r; ++ int ok = 0, r, q_good = 0; + BN_CTX *ctx = NULL; + BIGNUM *t1 = NULL, *t2 = NULL; + +@@ -120,7 +120,14 @@ int DH_check(const DH *dh, int *ret) + if (t2 == NULL) + goto err; + +- if (dh->q) { ++ if (dh->q != NULL) { ++ if (BN_ucmp(dh->p, dh->q) > 0) ++ q_good = 1; ++ else ++ *ret |= DH_CHECK_INVALID_Q_VALUE; ++ } ++ ++ if (q_good) { + if (BN_cmp(dh->g, BN_value_one()) <= 0) + *ret |= DH_NOT_SUITABLE_GENERATOR; + else if (BN_cmp(dh->g, dh->p) >= 0)