tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: remove redundant test 

OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c
This commit is contained in:
djm@openbsd.org 2023-03-31 04:04:15 +00:00 committed by Damien Miller
parent 4fb29eeafb
commit c6011129ca
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.390 2023/03/08 04:43:12 guenther Exp $ */ /* $OpenBSD: clientloop.c,v 1.391 2023/03/31 04:04:15 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2270,7 +2270,7 @@ key_accepted_by_hostkeyalgs(const struct sshkey *key)
const char *ktype = sshkey_ssh_name(key); const char *ktype = sshkey_ssh_name(key);
const char *hostkeyalgs = options.hostkeyalgorithms; const char *hostkeyalgs = options.hostkeyalgorithms;
if (key == NULL || key->type == KEY_UNSPEC) if (key->type == KEY_UNSPEC)
return 0; return 0;
if (key->type == KEY_RSA && if (key->type == KEY_RSA &&
(match_pattern_list("rsa-sha2-256", hostkeyalgs, 0) == 1 || (match_pattern_list("rsa-sha2-256", hostkeyalgs, 0) == 1 ||