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, 131 insertions, 0 deletions

diff --git a/ssherr.c b/ssherr.c
new file mode 100644
index 000000000..49fbb71de
--- /dev/null
+++ b/ssherr.c
@@ -0,0 +1,131 @@
+/*      $OpenBSD: ssherr.c,v 1.1 2014/04/30 05:29:56 djm Exp $  */
+/*
+ * Copyright (c) 2011 Damien Miller
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <string.h>
+#include "ssherr.h"
+
+const char *
+ssh_err(int n)
+{
+        switch (n) {
+        case SSH_ERR_SUCCESS:
+                return "success";
+        case SSH_ERR_INTERNAL_ERROR:
+                return "unexpected internal error";
+        case SSH_ERR_ALLOC_FAIL:
+                return "memory allocation failed";
+        case SSH_ERR_MESSAGE_INCOMPLETE:
+                return "incomplete message";
+        case SSH_ERR_INVALID_FORMAT:
+                return "invalid format";
+        case SSH_ERR_BIGNUM_IS_NEGATIVE:
+                return "bignum is negative";
+        case SSH_ERR_STRING_TOO_LARGE:
+                return "string is too large";
+        case SSH_ERR_BIGNUM_TOO_LARGE:
+                return "bignum is too large";
+        case SSH_ERR_ECPOINT_TOO_LARGE:
+                return "elliptic curve point is too large";
+        case SSH_ERR_NO_BUFFER_SPACE:
+                return "insufficient buffer space";
+        case SSH_ERR_INVALID_ARGUMENT:
+                return "invalid argument";
+        case SSH_ERR_KEY_BITS_MISMATCH:
+                return "key bits do not match";
+        case SSH_ERR_EC_CURVE_INVALID:
+                return "invalid elliptic curve";
+        case SSH_ERR_KEY_TYPE_MISMATCH:
+                return "key type does not match";
+        case SSH_ERR_KEY_TYPE_UNKNOWN:
+                return "unknown or unsupported key type";
+        case SSH_ERR_EC_CURVE_MISMATCH:
+                return "elliptic curve does not match";
+        case SSH_ERR_EXPECTED_CERT:
+                return "plain key provided where certificate required";
+        case SSH_ERR_KEY_LACKS_CERTBLOB:
+                return "key lacks certificate data";
+        case SSH_ERR_KEY_CERT_UNKNOWN_TYPE:
+                return "unknown/unsupported certificate type";
+        case SSH_ERR_KEY_CERT_INVALID_SIGN_KEY:
+                return "invalid certificate signing key";
+        case SSH_ERR_KEY_INVALID_EC_VALUE:
+                return "invalid elliptic curve value";
+        case SSH_ERR_SIGNATURE_INVALID:
+                return "incorrect signature";
+        case SSH_ERR_LIBCRYPTO_ERROR:
+                return "error in libcrypto";  /* XXX fetch and return */
+        case SSH_ERR_UNEXPECTED_TRAILING_DATA:
+                return "unexpected bytes remain after decoding";
+        case SSH_ERR_SYSTEM_ERROR:
+                return strerror(errno);
+        case SSH_ERR_KEY_CERT_INVALID:
+                return "invalid certificate";
+        case SSH_ERR_AGENT_COMMUNICATION:
+                return "communication with agent failed";
+        case SSH_ERR_AGENT_FAILURE:
+                return "agent refused operation";
+        case SSH_ERR_DH_GEX_OUT_OF_RANGE:
+                return "DH GEX group out of range";
+        case SSH_ERR_DISCONNECTED:
+                return "disconnected";
+        case SSH_ERR_MAC_INVALID:
+                return "message authentication code incorrect";
+        case SSH_ERR_NO_CIPHER_ALG_MATCH:
+                return "no matching cipher found";
+        case SSH_ERR_NO_MAC_ALG_MATCH:
+                return "no matching MAC found";
+        case SSH_ERR_NO_COMPRESS_ALG_MATCH:
+                return "no matching compression method found";
+        case SSH_ERR_NO_KEX_ALG_MATCH:
+                return "no matching key exchange method found";
+        case SSH_ERR_NO_HOSTKEY_ALG_MATCH:
+                return "no matching host key type found";
+        case SSH_ERR_PROTOCOL_MISMATCH:
+                return "protocol version mismatch";
+        case SSH_ERR_NO_PROTOCOL_VERSION:
+                return "could not read protocol version";
+        case SSH_ERR_NO_HOSTKEY_LOADED:
+                return "could not load host key";
+        case SSH_ERR_NEED_REKEY:
+                return "rekeying not supported by peer";
+        case SSH_ERR_PASSPHRASE_TOO_SHORT:
+                return "passphrase is too short (minimum four characters)";
+        case SSH_ERR_FILE_CHANGED:
+                return "file changed while reading";
+        case SSH_ERR_KEY_UNKNOWN_CIPHER:
+                return "key encrypted using unsupported cipher";
+        case SSH_ERR_KEY_WRONG_PASSPHRASE:
+                return "incorrect passphrase supplied to decrypt private key";
+        case SSH_ERR_KEY_BAD_PERMISSIONS:
+                return "bad permissions";
+        case SSH_ERR_KEY_CERT_MISMATCH:
+                return "certificate does not match key";
+        case SSH_ERR_KEY_NOT_FOUND:
+                return "key not found";
+        case SSH_ERR_AGENT_NOT_PRESENT:
+                return "agent not present";
+        case SSH_ERR_AGENT_NO_IDENTITIES:
+                return "agent contains no identities";
+        case SSH_ERR_KRL_BAD_MAGIC:
+                return "KRL file has invalid magic number";
+        case SSH_ERR_KEY_REVOKED:
+                return "Key is revoked";
+        default:
+                return "unknown error";
+        }
+}