1 files changed, 23 insertions, 18 deletions

diff --git a/sshd.c b/sshd.c
index 48162b629..5e7679a33 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.533 2019/03/01 02:32:39 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.537 2019/06/28 13:35:04 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -360,7 +360,7 @@ main_sigchld_handler(int sig)
         int status;
 
         while ((pid = waitpid(-1, &status, WNOHANG)) > 0 ||
-            (pid < 0 && errno == EINTR))
+            (pid == -1 && errno == EINTR))
                 ;
         errno = save_errno;
 }
@@ -483,7 +483,7 @@ privsep_preauth_child(void)
                 debug3("privsep user:group %u:%u", (u_int)privsep_pw->pw_uid,
                     (u_int)privsep_pw->pw_gid);
                 gidset[0] = privsep_pw->pw_gid;
-                if (setgroups(1, gidset) < 0)
+                if (setgroups(1, gidset) == -1)
                         fatal("setgroups: %.100s", strerror(errno));
                 permanently_set_uid(privsep_pw);
         }
@@ -523,7 +523,7 @@ privsep_preauth(struct ssh *ssh)
                 monitor_child_preauth(ssh, pmonitor);
 
                 /* Wait for the child's exit status */
-                while (waitpid(pid, &status, 0) < 0) {
+                while (waitpid(pid, &status, 0) == -1) {
                         if (errno == EINTR)
                                 continue;
                         pmonitor->m_pid = -1;
@@ -982,7 +982,7 @@ listen_on_addrs(struct listenaddr *la)
                 /* Create socket for listening. */
                 listen_sock = socket(ai->ai_family, ai->ai_socktype,
                     ai->ai_protocol);
-                if (listen_sock < 0) {
+                if (listen_sock == -1) {
                         /* kernel may not support ipv6 */
                         verbose("socket: %.100s", strerror(errno));
                         continue;
@@ -1011,7 +1011,7 @@ listen_on_addrs(struct listenaddr *la)
                 debug("Bind to port %s on %s.", strport, ntop);
 
                 /* Bind the socket to the desired port. */
-                if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) {
+                if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) {
                         error("Bind to port %s on %s failed: %.200s.",
                             strport, ntop, strerror(errno));
                         close(listen_sock);
@@ -1021,7 +1021,7 @@ listen_on_addrs(struct listenaddr *la)
                 num_listen_socks++;
 
                 /* Start listening on the port. */
-                if (listen(listen_sock, SSH_LISTEN_BACKLOG) < 0)
+                if (listen(listen_sock, SSH_LISTEN_BACKLOG) == -1)
                         fatal("listen on [%s]:%s: %.100s",
                             ntop, strport, strerror(errno));
                 logit("Server listening on %s port %s%s%s.",
@@ -1106,7 +1106,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
 
                 /* Wait in select until there is a connection. */
                 ret = select(maxfd+1, fdset, NULL, NULL, NULL);
-                if (ret < 0 && errno != EINTR)
+                if (ret == -1 && errno != EINTR)
                         error("select: %.100s", strerror(errno));
                 if (received_sigterm) {
                         logit("Received signal %d; terminating.",
@@ -1116,7 +1116,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
                                 unlink(options.pid_file);
                         exit(received_sigterm == SIGTERM ? 0 : 255);
                 }
-                if (ret < 0)
+                if (ret == -1)
                         continue;
 
                 for (i = 0; i < options.max_startups; i++) {
@@ -1156,7 +1156,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
                         fromlen = sizeof(from);
                         *newsock = accept(listen_socks[i],
                             (struct sockaddr *)&from, &fromlen);
-                        if (*newsock < 0) {
+                        if (*newsock == -1) {
                                 if (errno != EINTR && errno != EWOULDBLOCK &&
                                     errno != ECONNABORTED && errno != EAGAIN)
                                         error("accept: %.100s",
@@ -1276,7 +1276,7 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
 
                         /* Parent.  Stay in the loop. */
                         platform_post_fork_parent(pid);
-                        if (pid < 0)
+                        if (pid == -1)
                                 error("fork: %.100s", strerror(errno));
                         else
                                 debug("Forked child %ld.", (long)pid);
@@ -1329,7 +1329,7 @@ check_ip_options(struct ssh *ssh)
 
         memset(&from, 0, sizeof(from));
         if (getpeername(sock_in, (struct sockaddr *)&from,
-            &fromlen) < 0)
+            &fromlen) == -1)
                 return;
         if (from.ss_family != AF_INET)
                 return;
@@ -1390,7 +1390,7 @@ set_process_rdomain(struct ssh *ssh, const char *name)
 
 static void
 accumulate_host_timing_secret(struct sshbuf *server_cfg,
-    const struct sshkey *key)
+    struct sshkey *key)
 {
         static struct ssh_digest_ctx *ctx;
         u_char *hash;
@@ -1448,8 +1448,6 @@ main(int ac, char **av)
         Authctxt *authctxt;
         struct connection_info *connection_info = NULL;
 
-        ssh_malloc_init();      /* must be called before any mallocs */
-
 #ifdef HAVE_SECUREWARE
         (void)set_auth_parameters(ac, av);
 #endif
@@ -1740,6 +1738,12 @@ main(int ac, char **av)
                     &key, NULL)) != 0 && r != SSH_ERR_SYSTEM_ERROR)
                         do_log2(ll, "Unable to load host key \"%s\": %s",
                             options.host_key_files[i], ssh_err(r));
+                if (r == 0 && (r = sshkey_shield_private(key)) != 0) {
+                        do_log2(ll, "Unable to shield host key \"%s\": %s",
+                            options.host_key_files[i], ssh_err(r));
+                        sshkey_free(key);
+                        key = NULL;
+                }
                 if ((r = sshkey_load_public(options.host_key_files[i],
                     &pubkey, NULL)) != 0 && r != SSH_ERR_SYSTEM_ERROR)
                         do_log2(ll, "Unable to load host key \"%s\": %s",
@@ -1859,6 +1863,7 @@ main(int ac, char **av)
                  */
                 if (connection_info == NULL)
                         connection_info = get_connection_info(ssh, 0, 0);
+                connection_info->test = 1;
                 parse_server_match_config(&options, connection_info);
                 dump_config(&options);
         }
@@ -1906,7 +1911,7 @@ main(int ac, char **av)
         already_daemon = daemonized();
         if (!(debug_flag || inetd_flag || no_daemon_flag || already_daemon)) {
 
-                if (daemon(0, 0) < 0)
+                if (daemon(0, 0) == -1)
                         fatal("daemon() failed: %.200s", strerror(errno));
 
                 disconnect_controlling_tty();
@@ -1974,7 +1979,7 @@ main(int ac, char **av)
          * controlling terminal which will result in "could not set
          * controlling tty" errors.
          */
-        if (!debug_flag && !inetd_flag && setsid() < 0)
+        if (!debug_flag && !inetd_flag && setsid() == -1)
                 error("setsid: %.100s", strerror(errno));
 #endif
 
@@ -2052,7 +2057,7 @@ main(int ac, char **av)
 
         /* Set SO_KEEPALIVE if requested. */
         if (options.tcp_keep_alive && ssh_packet_connection_is_on_socket(ssh) &&
-            setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0)
+            setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) == -1)
                 error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));
 
         if ((remote_port = ssh_remote_port(ssh)) < 0) {