Import openssh_8.2p1.orig.tar.gz

1 files changed, 42 insertions, 3 deletions

diff --git a/packet.c b/packet.c
index 817da43b5..6d3e9172d 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.286 2019/06/28 13:35:04 deraadt Exp $ */
+/* $OpenBSD: packet.c,v 1.290 2020/01/30 07:20:05 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -58,7 +58,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
+#ifdef HAVE_POLL_H
 #include <poll.h>
+#endif
 #include <signal.h>
 #include <time.h>
 
@@ -74,7 +76,9 @@
 # endif
 #endif
 
+#ifdef WITH_ZLIB
 #include <zlib.h>
+#endif
 
 #include "xmalloc.h"
 #include "compat.h"
@@ -148,9 +152,11 @@ struct session_state {
         /* Scratch buffer for packet compression/decompression. */
         struct sshbuf *compression_buffer;
 
+#ifdef WITH_ZLIB
         /* Incoming/outgoing compression dictionaries */
         z_stream compression_in_stream;
         z_stream compression_out_stream;
+#endif
         int compression_in_started;
         int compression_out_started;
         int compression_in_failures;
@@ -528,9 +534,9 @@ ssh_remote_ipaddr(struct ssh *ssh)
                         ssh->local_ipaddr = get_local_ipaddr(sock);
                         ssh->local_port = get_local_port(sock);
                 } else {
-                        ssh->remote_ipaddr = strdup("UNKNOWN");
+                        ssh->remote_ipaddr = xstrdup("UNKNOWN");
                         ssh->remote_port = 65535;
-                        ssh->local_ipaddr = strdup("UNKNOWN");
+                        ssh->local_ipaddr = xstrdup("UNKNOWN");
                         ssh->local_port = 65535;
                 }
         }
@@ -607,6 +613,7 @@ ssh_packet_close_internal(struct ssh *ssh, int do_close)
                 state->newkeys[mode] = NULL;
                 ssh_clear_newkeys(ssh, mode);           /* next keys */
         }
+#ifdef WITH_ZLIB
         /* compression state is in shared mem, so we can only release it once */
         if (do_close && state->compression_buffer) {
                 sshbuf_free(state->compression_buffer);
@@ -633,6 +640,7 @@ ssh_packet_close_internal(struct ssh *ssh, int do_close)
                                 inflateEnd(stream);
                 }
         }
+#endif  /* WITH_ZLIB */
         cipher_free(state->send_context);
         cipher_free(state->receive_context);
         state->send_context = state->receive_context = NULL;
@@ -688,6 +696,7 @@ ssh_packet_init_compression(struct ssh *ssh)
         return 0;
 }
 
+#ifdef WITH_ZLIB
 static int
 start_compression_out(struct ssh *ssh, int level)
 {
@@ -819,6 +828,33 @@ uncompress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out)
         /* NOTREACHED */
 }
 
+#else   /* WITH_ZLIB */
+
+static int
+start_compression_out(struct ssh *ssh, int level)
+{
+        return SSH_ERR_INTERNAL_ERROR;
+}
+
+static int
+start_compression_in(struct ssh *ssh)
+{
+        return SSH_ERR_INTERNAL_ERROR;
+}
+
+static int
+compress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out)
+{
+        return SSH_ERR_INTERNAL_ERROR;
+}
+
+static int
+uncompress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out)
+{
+        return SSH_ERR_INTERNAL_ERROR;
+}
+#endif  /* WITH_ZLIB */
+
 void
 ssh_clear_newkeys(struct ssh *ssh, int mode)
 {
@@ -1814,6 +1850,7 @@ static void
 sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap)
 {
         char *tag = NULL, remote_id[512];
+        int oerrno = errno;
 
         sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
 
@@ -1841,6 +1878,7 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap)
         case SSH_ERR_NO_HOSTKEY_ALG_MATCH:
                 if (ssh && ssh->kex && ssh->kex->failed_choice) {
                         ssh_packet_clear_keys(ssh);
+                        errno = oerrno;
                         logdie("Unable to negotiate with %s: %s. "
                             "Their offer: %s", remote_id, ssh_err(r),
                             ssh->kex->failed_choice);
@@ -1853,6 +1891,7 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, va_list ap)
                             __func__);
                 }
                 ssh_packet_clear_keys(ssh);
+                errno = oerrno;
                 logdie("%s%sConnection %s %s: %s",
                     tag != NULL ? tag : "", tag != NULL ? ": " : "",
                     ssh->state->server_side ? "from" : "to",