1 files changed, 14 insertions, 8 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 2ed041559..5de0508d0 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.126 2019/01/26 22:35:01 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.130 2019/09/06 05:23:55 djm Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
@@ -19,7 +19,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
+#endif
 
 #include <netdb.h>
 #include <errno.h>
@@ -122,7 +124,7 @@ fdlim_get(int hard)
 #if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
         struct rlimit rlfd;
 
-        if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0)
+        if (getrlimit(RLIMIT_NOFILE, &rlfd) == -1)
                 return (-1);
         if ((hard ? rlfd.rlim_max : rlfd.rlim_cur) == RLIM_INFINITY)
                 return SSH_SYSFDMAX;
@@ -143,10 +145,10 @@ fdlim_set(int lim)
         if (lim <= 0)
                 return (-1);
 #if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE)
-        if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0)
+        if (getrlimit(RLIMIT_NOFILE, &rlfd) == -1)
                 return (-1);
         rlfd.rlim_cur = lim;
-        if (setrlimit(RLIMIT_NOFILE, &rlfd) < 0)
+        if (setrlimit(RLIMIT_NOFILE, &rlfd) == -1)
                 return (-1);
 #elif defined (HAVE_SETDTABLESIZE)
         setdtablesize(lim);
@@ -233,7 +235,12 @@ keygrab_ssh2(con *c)
                 break;
         case KT_RSA:
                 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ?
-                    "ssh-rsa-cert-v01@openssh.com" : "ssh-rsa";
+                    "rsa-sha2-512-cert-v01@openssh.com,"
+                    "rsa-sha2-256-cert-v01@openssh.com,"
+                    "ssh-rsa-cert-v01@openssh.com" :
+                    "rsa-sha2-512,"
+                    "rsa-sha2-256,"
+                    "ssh-rsa";
                 break;
         case KT_ED25519:
                 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ?
@@ -343,13 +350,13 @@ tcpconnect(char *host)
         }
         for (ai = aitop; ai; ai = ai->ai_next) {
                 s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-                if (s < 0) {
+                if (s == -1) {
                         error("socket: %s", strerror(errno));
                         continue;
                 }
                 if (set_nonblock(s) == -1)
                         fatal("%s: set_nonblock(%d)", __func__, s);
-                if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0 &&
+                if (connect(s, ai->ai_addr, ai->ai_addrlen) == -1 &&
                     errno != EINPROGRESS)
                         error("connect (`%s'): %s", host, strerror(errno));
                 else
@@ -656,7 +663,6 @@ main(int argc, char **argv)
         extern int optind;
         extern char *optarg;
 
-        ssh_malloc_init();      /* must be called before any mallocs */
         __progname = ssh_get_progname(argv[0]);
         seed_rng();
         TAILQ_INIT(&tq);