upstream: Remove unsupported algorithms from list of defaults at run

time and remove ifdef and distinct settings for OPENSSL=no case.

This will make things much simpler for -portable where the exact set
of algos depends on the configuration of both OpenSSH and the libcrypto
it's linked against (if any).  ok djm@

OpenBSD-Commit-ID: e0116d0183dcafc7a9c40ba5fe9127805c5dfdd2

1 files changed, 2 insertions, 3 deletions

diff --git a/clientloop.c b/clientloop.c
index 8f0332df4..4acf2806d 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.330 2019/12/21 02:19:13 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.331 2020/01/23 02:46:49 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2046,8 +2046,7 @@ static int
 key_accepted_by_hostkeyalgs(const struct sshkey *key)
 {
         const char *ktype = sshkey_ssh_name(key);
-        const char *hostkeyalgs = options.hostkeyalgorithms != NULL ?
-            options.hostkeyalgorithms : KEX_DEFAULT_PK_ALG;
+        const char *hostkeyalgs = options.hostkeyalgorithms;
 
         if (key == NULL || key->type == KEY_UNSPEC)
                 return 0;