From nobody Tue Sep 03 16:50:21 2024 X-Original-To: dev-commits-src-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 4Wys7Q3S5Gz5TYwN; Tue, 03 Sep 2024 16:50:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wys7Q321pz44Gg; Tue, 3 Sep 2024 16:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725382226; 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=6l+Px/umrBM2EgysHp9c+W54aL1HekxcU8lMl1dtjn8=; b=J33aIcKWa2IGYESAipnts/X2x5Iw+QZtqeumpYKXFeh/R+MXvvlMHD9qXvAO3cSHWHWk2s d0EUxTswSCy9nsjajI+pI/OyNwuvalc3no8FSuYjgvAAr+by7ouh8TzCl1gWo1P0yjCbVL dv10nA/PACk93wI0opGfFFR2W0vJW7gU4B4SvQNOI/nR9GX4hOBKUIj1dN3VUBLPpUg9io HSEYsYXqAPXzxNgAOyFbSw0ghTHZr6TagNR1L+xCKD+Jgwz7cqYAoyZ1pq6QGzOyJntKHd LUXEIKpqD55UzYUcEIlPCrGxG6VaXH4M8gnjIr5n+cvsvsll6WQXOWwXTEqOTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725382226; a=rsa-sha256; cv=none; b=HuByJkk1V4yPSh6yaN1N6O+eoFT/8xfaxJIBr5+AinzX9der/Ys2DULbQ72hFdOPveaYcB 638W/ujUd4ZT/hZSJQ6bWnjyzb+aktPDWsINbWFsv7pfosf+sDaQh98PjMvpNjIeAcB6vN TILNKggSzJ982T4Sy6uL8YHMVNSJtc0MwVS+IrprZDFA7muEn8IC0TwXaNXha35uZHMCXd 28qw/6pADiUIa5MazyExzj5ufEMe9kFwQfbaRseDuiDoyN4ZbATQFjhltsiKpEvDEeR52g vJ3mnfC/xwD7YBVr5x4Ntb2o7hInZNVtaCpdMUbc3nPnmU1SonUhhLgTZeUcnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725382226; 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=6l+Px/umrBM2EgysHp9c+W54aL1HekxcU8lMl1dtjn8=; b=XLliGQOn6elhLlYZoMS9pt3W/oX05MFzPdSpP27mylZBlhxxWlcd56CzWbP1GU206gvHXg mliJfMVD0lFr6FKRR2U2YWPxEwsLJ0jRJ12B6hfFKRBdxSN4PNeft1RocZHI8gZwDeeJYe EyYhqGbZITDHiJYWZEFJZDpW1gC/qQIt38bdUnw131FE1R62XqRnfIpsTVbsvLLkDX2pdR BtIigYg2mucqa0o8YCzUYBhelv3gQoGHet7YusNwiplszDgzHK7Ga7iLUGadFCSfsfNrb6 YwVwsJREN9YnmMVfjgC4hf4ZheZ1+cjFwMoQoN3fSLqOLhqosJhLoI+bxnwjOw== 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 4Wys7Q2d9rzpY4; Tue, 3 Sep 2024 16:50:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483GoQXn068290; Tue, 3 Sep 2024 16:50:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483GoL8w068280; Tue, 3 Sep 2024 16:50:21 GMT (envelope-from git) Date: Tue, 3 Sep 2024 16:50:21 GMT Message-Id: <202409031650.483GoL8w068280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Tetlow Subject: git: fbd465f26340 - main - openssl: Bring over fix for CVE-2024-6119 from vendor/openssl-3.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbd465f263400d3bc6c1a5c30857a76738c64396 Auto-Submitted: auto-generated The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=fbd465f263400d3bc6c1a5c30857a76738c64396 commit fbd465f263400d3bc6c1a5c30857a76738c64396 Merge: 4dabfcb61538 e60dbfd00b00 Author: Gordon Tetlow AuthorDate: 2024-09-03 16:47:46 +0000 Commit: Gordon Tetlow CommitDate: 2024-09-03 16:49:23 +0000 openssl: Bring over fix for CVE-2024-6119 from vendor/openssl-3.0. Merge commit 'e60dbfd00b009d424dfc5446d132872c93dd0aed' crypto/openssl/crypto/x509/v3_utl.c | 78 +++++++++++++++------- crypto/openssl/test/recipes/25-test_eai_data.t | 12 +++- .../test/recipes/25-test_eai_data/kdc-cert.pem | 21 ++++++ .../recipes/25-test_eai_data/kdc-root-cert.pem | 16 +++++ .../openssl/test/recipes/25-test_eai_data/kdc.sh | 41 ++++++++++++ 5 files changed, 142 insertions(+), 26 deletions(-) diff --cc crypto/openssl/test/recipes/25-test_eai_data/kdc-cert.pem index 000000000000,e8a2c6f55d45..e8a2c6f55d45 mode 000000,100644..100644 --- a/crypto/openssl/test/recipes/25-test_eai_data/kdc-cert.pem +++ b/crypto/openssl/test/recipes/25-test_eai_data/kdc-cert.pem diff --cc crypto/openssl/test/recipes/25-test_eai_data/kdc-root-cert.pem index 000000000000,a74c96bf3146..a74c96bf3146 mode 000000,100644..100644 --- a/crypto/openssl/test/recipes/25-test_eai_data/kdc-root-cert.pem +++ b/crypto/openssl/test/recipes/25-test_eai_data/kdc-root-cert.pem diff --cc crypto/openssl/test/recipes/25-test_eai_data/kdc.sh index 000000000000,7a8dbc719fb7..7a8dbc719fb7 mode 000000,100755..100755 --- a/crypto/openssl/test/recipes/25-test_eai_data/kdc.sh +++ b/crypto/openssl/test/recipes/25-test_eai_data/kdc.sh