aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2025-02-19 14:00:42 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2025-02-21 02:45:50 +0000
commit4b8a2f716588e58ddb39ccdb60189e8c57239457 (patch)
tree01b92ae78e295f1a00a4e8548cbe8a2901717c44
parent1920babc310ab8ebaa76188decf1aa5ed88e9d84 (diff)
ssh: Bump VersionAddendum for CVE fixes
Security: FreeBSD-SA-25:05.openssh Approved by: so Sponsored by: The FreeBSD Foundation (cherry picked from commit 62df41ae0a71e77ccb1e8fae06d82eec5dff441a) (cherry picked from commit 24ce323f020fb1ee1b463e524a7a6c15f47ec2a4)
-rw-r--r--crypto/openssh/sshd_config2
-rw-r--r--crypto/openssh/sshd_config.52
-rw-r--r--crypto/openssh/version.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 7f559775e3b3..a17484b1da2d 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 4de510ac8795..bc7d9e7df969 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -1944,7 +1944,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"