aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2025-02-19 14:00:42 +0000
committerEd Maste <emaste@FreeBSD.org>2025-02-19 15:02:39 +0000
commit2fc62d0bd4f7ca90d7abdfaf076dd49022bf7d54 (patch)
treef5735c77f05ff27a6adad02eeef00a92b40662b3
parent8c67967cb14b0ab7e26ffa9ab6cef470a154e030 (diff)
ssh: Bump VersionAddendum for CVE fixes
Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 62df41ae0a71e77ccb1e8fae06d82eec5dff441a) (cherry picked from commit 24ce323f020fb1ee1b463e524a7a6c15f47ec2a4)
-rw-r--r--crypto/openssh/ssh_config2
-rw-r--r--crypto/openssh/ssh_config.52
-rw-r--r--crypto/openssh/sshd_config2
-rw-r--r--crypto/openssh/sshd_config.52
-rw-r--r--crypto/openssh/version.h2
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"