From nobody Tue Aug 1 20:04:35 2023 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 4RFmKs2Hznz4pncj; Tue, 1 Aug 2023 20:04:37 +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 4RFmKc2P7Kz3G5W; Tue, 1 Aug 2023 20:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690920276; 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=5omF4P8byMvFooHm8J/yzjiEmy2OyiAPm+5JZN0ENn8=; b=KmwWE4WGJ3LtueG4C9QOsYTLdQ6AgTyQqTGy9NaRrSOah38uDdC679sLztlG90IxziT5gd WoK9D6RfJdhHLsB1uFpO58KdbSJkbff9ldhnNfP/7JXGaNr3A+CqjHt6rKGd8GnDJNQsp+ yswc0u+2JHZR3O0i7wyemSvpcXGv9oCezE+UpBlVGAOpbepjorcQqztFtfqgUfcy9fZNgw VQhcS5UsV8U5VAXUGvue9FO5jsuOsNC56K8DLIFL/ydN4dx1z1y3DrhadhKj6xg4mPln+M O5akPA6JcW6/W6sGxtFxERe/vX2wtVQ8g9swwGpCEJ/HjBcNPdHCJ77jZ39f+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690920276; a=rsa-sha256; cv=none; b=mDiuVmdgz0UXdG8Sbne0257bzE0UcLJF22nDbz0C0XTaOviJpzE9rnqQQ1Ch0KKlLrntSm qISLjT8e8UyLqIegKkneakgul5/ScipcCVOURWBXj1Vmri+JpoitAlPI9wlhjDAggxHP2g tGc/SS0eKAVEiKDvL7tnLIhdBptKdu35ByeUdduzTlJg+LxFMvT6AJizT4ud6CFkaWn6Zv wQif/UMSVDZgY6Cv1QZujfT9lljDcFzpqerUk6b0fQL7gocfQ6hzFX0gFCsrdwIISp1i3M hKGZzE94iMAn6TR204bt1BMPepmNObl4COGrQh6sjANZpjgAalFGBrGeDAlB9w== 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=1690920276; 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=5omF4P8byMvFooHm8J/yzjiEmy2OyiAPm+5JZN0ENn8=; b=Vhpu8t+2gN/ofD23IESs+PgG1YOtSI9dZ+RwraXcniXYDkE6unYfIxP0c06Lr4ZAftcv2C niG+qgAPmV0DKx7ksMOcfl/6/zrkHThe0pu3GFj7SO7xrhwbh119uACJgKtgiKlP8P0k5X qTVZdi3d6o/uD2rJWR7j160204FgyPgXU8RD/QU8ZLMLPPORgQ3zvDpEHZtDgq7srSuhDP gDIRlKHM++2204u0CRz3u+qsi7jBJ5aoB02gxeCRECidSAfoppZmhjMXFJQ70xxXc+pnyq FZ93MEB2VPMtXIq/HUdCQRGMgrVLhJ77bSqWygNRT/XDeysqtqeWWdW9BAr1KQ== 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 4RFmKb6j4GzrJ7; Tue, 1 Aug 2023 20:04:35 +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 371K4Zgq013321; Tue, 1 Aug 2023 20:04:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371K4ZDi013320; Tue, 1 Aug 2023 20:04:35 GMT (envelope-from git) Date: Tue, 1 Aug 2023 20:04:35 GMT Message-Id: <202308012004.371K4ZDi013320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3d3a1cbfd7a2 - releng/13.1 - ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 3d3a1cbfd7a2081efc0be43ce4be0212e5f6a368 Auto-Submitted: auto-generated The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d3a1cbfd7a2081efc0be43ce4be0212e5f6a368 commit 3d3a1cbfd7a2081efc0be43ce4be0212e5f6a368 Author: Ed Maste AuthorDate: 2023-08-01 14:40:02 +0000 Commit: Mark Johnston CommitDate: 2023-08-01 19:48:26 +0000 ssh: Apply CVE-2023-38408 fix from OpenSSH 9.3p2 Approved by: so Security: FreeBSD-SA-23:08.ssh Security: CVE-2023-38408 --- crypto/openssh/ssh-pkcs11.c | 6 ++---- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/crypto/openssh/ssh-pkcs11.c b/crypto/openssh/ssh-pkcs11.c index 37a6b1b5bcae..84fb11f5a7d6 100644 --- a/crypto/openssh/ssh-pkcs11.c +++ b/crypto/openssh/ssh-pkcs11.c @@ -1536,10 +1536,8 @@ pkcs11_register_provider(char *provider_id, char *pin, error("dlopen %s failed: %s", provider_id, dlerror()); goto fail; } - if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) { - error("dlsym(C_GetFunctionList) failed: %s", dlerror()); - goto fail; - } + if ((getfunctionlist = dlsym(handle, "C_GetFunctionList")) == NULL) + fatal("dlsym(C_GetFunctionList) failed: %s", dlerror()); p = xcalloc(1, sizeof(*p)); p->name = xstrdup(provider_id); p->handle = handle; diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index eb9bdcc437fb..5b61d395f302 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20211221 +#VersionAddendum FreeBSD-20230719 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 527f3d4bb46e..2646a7186929 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1805,7 +1805,7 @@ The default is Optionally specifies additional text to append to the SSH protocol banner sent by the server upon connection. The default is -.Qq FreeBSD-20211221 . +.Qq FreeBSD-20230719 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index ddbdbf778fe0..320e7f4d2a4d 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -6,7 +6,7 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20211221" +#define SSH_VERSION_FREEBSD "FreeBSD-20230719" #ifdef WITH_OPENSSL #define OPENSSL_VERSION_STRING OpenSSL_version(OPENSSL_VERSION)