From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 31 Mar 2023 04:04:15 +0000 (+0000)
Subject: upstream: remove redundant test
X-Git-Tag: V_9_4_P1~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6011129cafe4c411f6ef670a4cf271314708eb8;p=thirdparty%2Fopenssh-portable.git

upstream: remove redundant test

OpenBSD-Commit-ID: 6a0b719f9b1ae9d42ad8c5b144c7962c93792f7c
---

diff --git a/clientloop.c b/clientloop.c
index 3fb72fb2f..baa988af4 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -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>
  * 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 *hostkeyalgs = options.hostkeyalgorithms;
 
-	if (key == NULL || key->type == KEY_UNSPEC)
+	if (key->type == KEY_UNSPEC)
 		return 0;
 	if (key->type == KEY_RSA &&
 	    (match_pattern_list("rsa-sha2-256", hostkeyalgs, 0) == 1 ||