upstream: Remove support for loading HostBasedAuthentication keys

directly in ssh(1) and always use ssh-keysign.  This removes one of the few
remaining reasons why ssh(1) might be setuid.  ok markus@

OpenBSD-Commit-ID: 97f01e1448707129a20d75f86bad5d27c3cf0b7d

1 files changed, 3 insertions, 7 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index fb90e8afc..7b0e18f28 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.280 2018/07/11 18:55:11 markus Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.281 2018/07/16 11:05:41 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -1990,12 +1990,8 @@ userauth_hostbased(Authctxt *authctxt)
 #ifdef DEBUG_PK
         sshbuf_dump(b, stderr);
 #endif
-        if (authctxt->sensitive->external_keysign)
-                r = ssh_keysign(private, &sig, &siglen,
-                    sshbuf_ptr(b), sshbuf_len(b));
-        else if ((r = sshkey_sign(private, &sig, &siglen,
-            sshbuf_ptr(b), sshbuf_len(b), NULL, datafellows)) != 0)
-                debug("%s: sshkey_sign: %s", __func__, ssh_err(r));
+        r = ssh_keysign(private, &sig, &siglen,
+            sshbuf_ptr(b), sshbuf_len(b));
         if (r != 0) {
                 error("sign using hostkey %s %s failed",
                     sshkey_ssh_name(private), fp);