From nobody Wed Feb 19 16:05:16 2025 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 4Yyh7L1Ntrz5pY7M; Wed, 19 Feb 2025 16:05:18 +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 4Yyh7K0KZcz3Vpw; Wed, 19 Feb 2025 16:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739981117; 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=QqBjBVAi8F7v3SJE83j1Rnbvg45K+zMJWr5BpdyfDFk=; b=iC7OzEdjYaijX3BCO5BhfEm2uXVl5MI9+Kz+mo1mEuhY35PuS2DxJoPmhPdxi+cA+O2l8F s8C0vdUC001LnIV1Kkh3NLWpnyuezqypBGaeGxLP6dhLhqQmaCcTdGCx0Eibyrw+4xWdKg w10Bz63e+dtgl3oiM2EE3tq5VR8cgcMBj6PpJQ5IA0NXbP/5LtvyfIzoLyYNMXHiVTzlOY LcnFGPWn3VK6QnGWRYs+LxHGO22ucEtEU0sLwPSMJzoBQflpoI8V3O2JxBkU2IeCl9FXz0 B68aIgzbfS2hJktjeQBQWXssFFPovloI6SqkHkZ8p54UgNVagrCTMVW/TVp2TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739981117; a=rsa-sha256; cv=none; b=xpzG1Sqg1HZdXnddiNUaGfL2hWshpyNOhTwgd8oInpSUSy6JByZRPj2QUrdNnHyEocmx/v 1P/buoRBNlHIsYpEBIzbzQR8x5kKs1+EDRttaTLrlXe/t0Xx/+Krxtwwv8QvZBcRZqkAXk l6UCG3xnEdjPAEwRUG5qfe7Yg+A5giSINZnmfCMHos83/QWMqukbZqySLxWyD2R9ZL9176 mt76D/s86zt8sSLBbg1A7Ew9moeHrSBaGPlUpioyLABpydwd9ynCpgxPnm7qSkEoNFa91C LfOHIA/sn/Xp+8A6H5KvikV0wyQwdtJOtZlK49IgSFStQ9SL4BvqgkL3BN7/FQ== 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=1739981117; 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=QqBjBVAi8F7v3SJE83j1Rnbvg45K+zMJWr5BpdyfDFk=; b=gT3+pk5AQ8OeF+4AI1j9Jn05ou6BZj1Oi5t2pFxUCiHZHDZjC1hyLES0GRVqOBtnazGKtT zN6dvDZlXqUB9nOojdTrj0QC2Zuyx7mB5MGwB+Q8glMmFUa0JGVeiULeXvRMWWYreHtFSZ eSuhZUNaoJWXe7o8JTlB/GAi87KUFbtO8TdutFI15yOIXUosUxm7q6UVdoFSgeS9An3Kv8 ehTszLubKRvQcSLkcuLdvvjDGU/B0d7Xi4ei2Wyqy4bIEfIDjlAEI6SBydXCfGivd7mUW0 5qj+FYSUMvoXXKjnLRMUfGFFQ5sazz+IJo5ez8QNtVcRlAGfk0pQ2H6kkuTd6A== 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 4Yyh7J63THz1C80; Wed, 19 Feb 2025 16:05:16 +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 51JG5G93045695; Wed, 19 Feb 2025 16:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JG5GOB045693; Wed, 19 Feb 2025 16:05:16 GMT (envelope-from git) Date: Wed, 19 Feb 2025 16:05:16 GMT Message-Id: <202502191605.51JG5GOB045693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2fc62d0bd4f7 - stable/13 - ssh: Bump VersionAddendum for CVE fixes 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2fc62d0bd4f7ca90d7abdfaf076dd49022bf7d54 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2fc62d0bd4f7ca90d7abdfaf076dd49022bf7d54 commit 2fc62d0bd4f7ca90d7abdfaf076dd49022bf7d54 Author: Ed Maste AuthorDate: 2025-02-19 14:00:42 +0000 Commit: Ed Maste CommitDate: 2025-02-19 15:02:39 +0000 ssh: Bump VersionAddendum for CVE fixes Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 62df41ae0a71e77ccb1e8fae06d82eec5dff441a) (cherry picked from commit 24ce323f020fb1ee1b463e524a7a6c15f47ec2a4) --- crypto/openssh/ssh_config | 2 +- crypto/openssh/ssh_config.5 | 2 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config index a047ce2deb93..518edcd2a01a 100644 --- a/crypto/openssh/ssh_config +++ b/crypto/openssh/ssh_config @@ -44,4 +44,4 @@ # ProxyCommand ssh -q -W %h:%p gateway.example.com # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k -# VersionAddendum FreeBSD-20240806 +# VersionAddendum FreeBSD-20250219 diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5 index de1903ba43a2..60e4b31a2de5 100644 --- a/crypto/openssh/ssh_config.5 +++ b/crypto/openssh/ssh_config.5 @@ -2137,7 +2137,7 @@ in Specifies a string to append to the regular version string to identify OS- or site-specific modifications. The default is -.Dq FreeBSD-20240806 . +.Dq FreeBSD-20250219 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 866e905d9515..fddc6fee17e3 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-20240806 +#VersionAddendum FreeBSD-20250219 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index a354c1ef2b0a..a5d6ef07c83f 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1947,7 +1947,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-20240806 . +.Qq FreeBSD-20250219 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 82be0be8498f..f3fb7fe333eb 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -5,4 +5,4 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20240806" +#define SSH_VERSION_FREEBSD "FreeBSD-20250219"