diff options
author | Ed Maste <emaste@FreeBSD.org> | 2024-03-18 14:00:57 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2024-03-25 22:39:14 +0000 |
commit | b16cb28aca00112db2a7b5c070ee019c100cbc20 (patch) | |
tree | ed208fe76c6e330706f6c39d2d10e1b6b2afa5c4 /crypto/openssh/sshconnect.c | |
parent | 3b5a0cbf6ab8ee267610396776c48adceb306ece (diff) |
ssh: Update to OpenSSH 9.7p1
This release contains mostly bugfixes.
It also makes support for the DSA signature algorithm a compile-time
option, with plans to disable it upstream later this year and remove
support entirely in 2025.
Full release notes at https://www.openssh.com/txt/release-9.7
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
(cherry picked from commit a91a246563dffa876a52f53a98de4af9fa364c52)
(cherry picked from commit 464fa66f639bdc8e340dd3f640af4309530d48ca)
Diffstat (limited to 'crypto/openssh/sshconnect.c')
-rw-r--r-- | crypto/openssh/sshconnect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index d2cc392b343e..2d4c4b19e64b 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.365 2023/11/20 02:50:00 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.366 2024/01/11 01:45:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1596,7 +1596,9 @@ show_other_keys(struct hostkeys *hostkeys, struct sshkey *key) { int type[] = { KEY_RSA, +#ifdef WITH_DSA KEY_DSA, +#endif KEY_ECDSA, KEY_ED25519, KEY_XMSS, |