Merge 6.7p1.

  * New upstream release (http://www.openssh.com/txt/release-6.7):
    - sshd(8): The default set of ciphers and MACs has been altered to
      remove unsafe algorithms.  In particular, CBC ciphers and arcfour* are
      disabled by default.  The full set of algorithms remains available if
      configured explicitly via the Ciphers and MACs sshd_config options.
    - ssh(1), sshd(8): Add support for Unix domain socket forwarding.  A
      remote TCP port may be forwarded to a local Unix domain socket and
      vice versa or both ends may be a Unix domain socket (closes: #236718).
    - ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519
      key types.
    - sftp(1): Allow resumption of interrupted uploads.
    - ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is
      the same as the one sent during initial key exchange.
    - sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses
      when GatewayPorts=no; allows client to choose address family.
    - sshd(8): Add a sshd_config PermitUserRC option to control whether
      ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys
      option.
    - ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that
      expands to a unique identifer based on a hash of the tuple of (local
      host, remote user, hostname, port).  Helps avoid exceeding miserly
      pathname limits for Unix domain sockets in multiplexing control paths.
    - sshd(8): Make the "Too many authentication failures" message include
      the user, source address, port and protocol in a format similar to the
      authentication success / failure messages.
    - Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is
      available. It considers time spent suspended, thereby ensuring
      timeouts (e.g. for expiring agent keys) fire correctly (closes:
      #734553).
    - Use prctl() to prevent sftp-server from accessing
      /proc/self/{mem,maps}.
  * Restore TCP wrappers support, removed upstream in 6.7.  It is true that
    dropping this reduces preauth attack surface in sshd.  On the other
    hand, this support seems to be quite widely used, and abruptly dropping
    it (from the perspective of users who don't read openssh-unix-dev) could
    easily cause more serious problems in practice.  It's not entirely clear
    what the right long-term answer for Debian is, but it at least probably
    doesn't involve dropping this feature shortly before a freeze.
  * Replace patch to disable OpenSSL version check with an updated version
    of Kurt Roeckx's patch from #732940 to just avoid checking the status
    field.

1 files changed, 107 insertions, 36 deletions

diff --git a/ssh.c b/ssh.c
index 3e63708da..5bce695d9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.401 2014/02/26 20:18:37 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.407 2014/07/17 07:22:19 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -71,8 +71,10 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#endif
 #include "openbsd-compat/openssl-compat.h"
 #include "openbsd-compat/sys-queue.h"
 
@@ -83,6 +85,7 @@
 #include "canohost.h"
 #include "compat.h"
 #include "cipher.h"
+#include "digest.h"
 #include "packet.h"
 #include "buffer.h"
 #include "channels.h"
@@ -93,9 +96,9 @@
 #include "dispatch.h"
 #include "clientloop.h"
 #include "log.h"
+#include "misc.h"
 #include "readconf.h"
 #include "sshconnect.h"
-#include "misc.h"
 #include "kex.h"
 #include "mac.h"
 #include "sshpty.h"
@@ -420,8 +423,11 @@ main(int ac, char **av)
         int timeout_ms;
         extern int optind, optreset;
         extern char *optarg;
-        Forward fwd;
+        struct Forward fwd;
         struct addrinfo *addrs = NULL;
+        struct ssh_digest_ctx *md;
+        u_char conn_hash[SSH_DIGEST_MAX_LENGTH];
+        char *conn_hash_hex;
 
         /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
         sanitise_stdfd();
@@ -539,7 +545,7 @@ main(int ac, char **av)
                         options.forward_x11_trusted = 1;
                         break;
                 case 'g':
-                        options.gateway_ports = 1;
+                        options.fwd_opts.gateway_ports = 1;
                         break;
                 case 'O':
                         if (stdio_forward_host != NULL)
@@ -631,7 +637,13 @@ main(int ac, char **av)
                         break;
                 case 'V':
                         fprintf(stderr, "%s, %s\n",
-                            SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));
+                            SSH_RELEASE,
+#ifdef WITH_OPENSSL
+                            SSLeay_version(SSLEAY_VERSION)
+#else
+                            "without OpenSSL"
+#endif
+                        );
                         if (opt == 'V')
                                 exit(0);
                         break;
@@ -828,8 +840,10 @@ main(int ac, char **av)
 
         host_arg = xstrdup(host);
 
+#ifdef WITH_OPENSSL
         OpenSSL_add_all_algorithms();
         ERR_load_crypto_strings();
+#endif
 
         /* Initialize the command to execute on remote host. */
         buffer_init(&command);
@@ -876,7 +890,13 @@ main(int ac, char **av)
             SYSLOG_FACILITY_USER, !use_syslog);
 
         if (debug_flag)
-                logit("%s, %s", SSH_VERSION, SSLeay_version(SSLEAY_VERSION));
+                logit("%s, %s", SSH_RELEASE,
+#ifdef WITH_OPENSSL
+                    SSLeay_version(SSLEAY_VERSION)
+#else
+                    "without OpenSSL"
+#endif
+                );
 
         /* Parse the configuration files */
         process_config_files(pw);
@@ -914,10 +934,14 @@ main(int ac, char **av)
         if (addrs == NULL && options.num_permitted_cnames != 0 &&
             (option_clear_or_none(options.proxy_command) ||
             options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) {
-                if ((addrs = resolve_host(host, options.port, 1,
-                    cname, sizeof(cname))) == NULL)
-                        cleanup_exit(255); /* resolve_host logs the error */
-                check_follow_cname(&host, cname);
+                if ((addrs = resolve_host(host, options.port,
+                    option_clear_or_none(options.proxy_command),
+                    cname, sizeof(cname))) == NULL) {
+                        /* Don't fatal proxied host names not in the DNS */
+                        if (option_clear_or_none(options.proxy_command))
+                                cleanup_exit(255); /* logged in resolve_host */
+                } else
+                        check_follow_cname(&host, cname);
         }
 
         /*
@@ -982,12 +1006,29 @@ main(int ac, char **av)
         shorthost[strcspn(thishost, ".")] = '\0';
         snprintf(portstr, sizeof(portstr), "%d", options.port);
 
+        if ((md = ssh_digest_start(SSH_DIGEST_SHA1)) == NULL ||
+            ssh_digest_update(md, thishost, strlen(thishost)) < 0 ||
+            ssh_digest_update(md, host, strlen(host)) < 0 ||
+            ssh_digest_update(md, portstr, strlen(portstr)) < 0 ||
+            ssh_digest_update(md, options.user, strlen(options.user)) < 0 ||
+            ssh_digest_final(md, conn_hash, sizeof(conn_hash)) < 0)
+                fatal("%s: mux digest failed", __func__);
+        ssh_digest_free(md);
+        conn_hash_hex = tohex(conn_hash, ssh_digest_bytes(SSH_DIGEST_SHA1));
+
         if (options.local_command != NULL) {
                 debug3("expanding LocalCommand: %s", options.local_command);
                 cp = options.local_command;
-                options.local_command = percent_expand(cp, "d", pw->pw_dir,
-                    "h", host, "l", thishost, "n", host_arg, "r", options.user,
-                    "p", portstr, "u", pw->pw_name, "L", shorthost,
+                options.local_command = percent_expand(cp,
+                    "C", conn_hash_hex,
+                    "L", shorthost,
+                    "d", pw->pw_dir,
+                    "h", host,
+                    "l", thishost,
+                    "n", host_arg,
+                    "p", portstr,
+                    "r", options.user,
+                    "u", pw->pw_name,
                     (char *)NULL);
                 debug3("expanded LocalCommand: %s", options.local_command);
                 free(cp);
@@ -997,12 +1038,20 @@ main(int ac, char **av)
                 cp = tilde_expand_filename(options.control_path,
                     original_real_uid);
                 free(options.control_path);
-                options.control_path = percent_expand(cp, "h", host,
-                    "l", thishost, "n", host_arg, "r", options.user,
-                    "p", portstr, "u", pw->pw_name, "L", shorthost,
+                options.control_path = percent_expand(cp,
+                    "C", conn_hash_hex,
+                    "L", shorthost,
+                    "h", host,
+                    "l", thishost,
+                    "n", host_arg,
+                    "p", portstr,
+                    "r", options.user,
+                    "u", pw->pw_name,
                     (char *)NULL);
                 free(cp);
         }
+        free(conn_hash_hex);
+
         if (muxclient_command != 0 && options.control_path == NULL)
                 fatal("No ControlPath specified for \"-O\" command");
         if (options.control_path != NULL)
@@ -1256,13 +1305,17 @@ fork_postauth(void)
 static void
 ssh_confirm_remote_forward(int type, u_int32_t seq, void *ctxt)
 {
-        Forward *rfwd = (Forward *)ctxt;
+        struct Forward *rfwd = (struct Forward *)ctxt;
 
         /* XXX verbose() on failure? */
-        debug("remote forward %s for: listen %d, connect %s:%d",
+        debug("remote forward %s for: listen %s%s%d, connect %s:%d",
             type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure",
-            rfwd->listen_port, rfwd->connect_host, rfwd->connect_port);
-        if (rfwd->listen_port == 0) {
+            rfwd->listen_path ? rfwd->listen_path :
+            rfwd->listen_host ? rfwd->listen_host : "",
+            (rfwd->listen_path || rfwd->listen_host) ? ":" : "",
+            rfwd->listen_port, rfwd->connect_path ? rfwd->connect_path :
+            rfwd->connect_host, rfwd->connect_port);
+        if (rfwd->listen_path == NULL && rfwd->listen_port == 0) {
                 if (type == SSH2_MSG_REQUEST_SUCCESS) {
                         rfwd->allocated_port = packet_get_int();
                         logit("Allocated port %u for remote forward to %s:%d",
@@ -1276,12 +1329,21 @@ ssh_confirm_remote_forward(int type, u_int32_t seq, void *ctxt)
         }
         
         if (type == SSH2_MSG_REQUEST_FAILURE) {
-                if (options.exit_on_forward_failure)
-                        fatal("Error: remote port forwarding failed for "
-                            "listen port %d", rfwd->listen_port);
-                else
-                        logit("Warning: remote port forwarding failed for "
-                            "listen port %d", rfwd->listen_port);
+                if (options.exit_on_forward_failure) {
+                        if (rfwd->listen_path != NULL)
+                                fatal("Error: remote port forwarding failed "
+                                    "for listen path %s", rfwd->listen_path);
+                        else
+                                fatal("Error: remote port forwarding failed "
+                                    "for listen port %d", rfwd->listen_port);
+                } else {
+                        if (rfwd->listen_path != NULL)
+                                logit("Warning: remote port forwarding failed "
+                                    "for listen path %s", rfwd->listen_path);
+                        else
+                                logit("Warning: remote port forwarding failed "
+                                    "for listen port %d", rfwd->listen_port);
+                }
         }
         if (++remote_forward_confirms_received == options.num_remote_forwards) {
                 debug("All remote forwarding requests processed");
@@ -1298,6 +1360,13 @@ client_cleanup_stdio_fwd(int id, void *arg)
 }
 
 static void
+ssh_stdio_confirm(int id, int success, void *arg)
+{
+        if (!success)
+                fatal("stdio forwarding failed");
+}
+
+static void
 ssh_init_stdio_forwarding(void)
 {
         Channel *c;
@@ -1317,6 +1386,7 @@ ssh_init_stdio_forwarding(void)
             stdio_forward_port, in, out)) == NULL)
                 fatal("%s: channel_connect_stdio_fwd failed", __func__);
         channel_register_cleanup(c->self, client_cleanup_stdio_fwd, 0);
+        channel_register_open_confirm(c->self, ssh_stdio_confirm, NULL);
 }
 
 static void
@@ -1329,18 +1399,18 @@ ssh_init_forwarding(void)
         for (i = 0; i < options.num_local_forwards; i++) {
                 debug("Local connections to %.200s:%d forwarded to remote "
                     "address %.200s:%d",
+                    (options.local_forwards[i].listen_path != NULL) ?
+                    options.local_forwards[i].listen_path :
                     (options.local_forwards[i].listen_host == NULL) ?
-                    (options.gateway_ports ? "*" : "LOCALHOST") :
+                    (options.fwd_opts.gateway_ports ? "*" : "LOCALHOST") :
                     options.local_forwards[i].listen_host,
                     options.local_forwards[i].listen_port,
+                    (options.local_forwards[i].connect_path != NULL) ?
+                    options.local_forwards[i].connect_path :
                     options.local_forwards[i].connect_host,
                     options.local_forwards[i].connect_port);
                 success += channel_setup_local_fwd_listener(
-                    options.local_forwards[i].listen_host,
-                    options.local_forwards[i].listen_port,
-                    options.local_forwards[i].connect_host,
-                    options.local_forwards[i].connect_port,
-                    options.gateway_ports);
+                    &options.local_forwards[i], &options.fwd_opts);
         }
         if (i > 0 && success != i && options.exit_on_forward_failure)
                 fatal("Could not request local forwarding.");
@@ -1351,17 +1421,18 @@ ssh_init_forwarding(void)
         for (i = 0; i < options.num_remote_forwards; i++) {
                 debug("Remote connections from %.200s:%d forwarded to "
                     "local address %.200s:%d",
+                    (options.remote_forwards[i].listen_path != NULL) ?
+                    options.remote_forwards[i].listen_path :
                     (options.remote_forwards[i].listen_host == NULL) ?
                     "LOCALHOST" : options.remote_forwards[i].listen_host,
                     options.remote_forwards[i].listen_port,
+                    (options.remote_forwards[i].connect_path != NULL) ?
+                    options.remote_forwards[i].connect_path :
                     options.remote_forwards[i].connect_host,
                     options.remote_forwards[i].connect_port);
                 options.remote_forwards[i].handle =
                     channel_request_remote_forwarding(
-                    options.remote_forwards[i].listen_host,
-                    options.remote_forwards[i].listen_port,
-                    options.remote_forwards[i].connect_host,
-                    options.remote_forwards[i].connect_port);
+                    &options.remote_forwards[i]);
                 if (options.remote_forwards[i].handle < 0) {
                         if (options.exit_on_forward_failure)
                                 fatal("Could not request remote forwarding.");