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, 66 insertions, 122 deletions

diff --git a/key.h b/key.h
index c8aeba29e..c6401a576 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.h,v 1.41 2014/01/09 23:20:00 djm Exp $ */
+/* $OpenBSD: key.h,v 1.42 2014/06/24 01:13:21 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -26,142 +26,86 @@
 #ifndef KEY_H
 #define KEY_H
 
-#include "buffer.h"
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#ifdef OPENSSL_HAS_ECC
-#include <openssl/ec.h>
+#include "sshkey.h"
+
+typedef struct sshkey Key;
+
+#define types sshkey_types
+#define fp_type sshkey_fp_type
+#define fp_rep sshkey_fp_rep
+
+#ifndef SSH_KEY_NO_DEFINE
+#define key_new                 sshkey_new
+#define key_free                sshkey_free
+#define key_equal_public        sshkey_equal_public
+#define key_equal               sshkey_equal
+#define key_fingerprint         sshkey_fingerprint
+#define key_type                sshkey_type
+#define key_cert_type           sshkey_cert_type
+#define key_ssh_name            sshkey_ssh_name
+#define key_ssh_name_plain      sshkey_ssh_name_plain
+#define key_type_from_name      sshkey_type_from_name
+#define key_ecdsa_nid_from_name sshkey_ecdsa_nid_from_name
+#define key_type_is_cert        sshkey_type_is_cert
+#define key_size                sshkey_size
+#define key_ecdsa_bits_to_nid   sshkey_ecdsa_bits_to_nid
+#define key_ecdsa_key_to_nid    sshkey_ecdsa_key_to_nid
+#define key_names_valid2        sshkey_names_valid2
+#define key_is_cert             sshkey_is_cert
+#define key_type_plain          sshkey_type_plain
+#define key_cert_is_legacy      sshkey_cert_is_legacy
+#define key_curve_name_to_nid   sshkey_curve_name_to_nid
+#define key_curve_nid_to_bits   sshkey_curve_nid_to_bits
+#define key_curve_nid_to_name   sshkey_curve_nid_to_name
+#define key_ec_nid_to_hash_alg  sshkey_ec_nid_to_hash_alg
+#define key_dump_ec_point       sshkey_dump_ec_point
+#define key_dump_ec_key         sshkey_dump_ec_key
+#define key_fingerprint         sshkey_fingerprint
 #endif
 
-typedef struct Key Key;
-enum types {
-        KEY_RSA1,
-        KEY_RSA,
-        KEY_DSA,
-        KEY_ECDSA,
-        KEY_ED25519,
-        KEY_RSA_CERT,
-        KEY_DSA_CERT,
-        KEY_ECDSA_CERT,
-        KEY_ED25519_CERT,
-        KEY_RSA_CERT_V00,
-        KEY_DSA_CERT_V00,
-        KEY_NULL,
-        KEY_UNSPEC
-};
-enum fp_type {
-        SSH_FP_SHA1,
-        SSH_FP_MD5,
-        SSH_FP_SHA256
-};
-enum fp_rep {
-        SSH_FP_HEX,
-        SSH_FP_BUBBLEBABBLE,
-        SSH_FP_RANDOMART
-};
-
-/* key is stored in external hardware */
-#define KEY_FLAG_EXT            0x0001
-
-#define CERT_MAX_PRINCIPALS     256
-struct KeyCert {
-        Buffer           certblob; /* Kept around for use on wire */
-        u_int            type; /* SSH2_CERT_TYPE_USER or SSH2_CERT_TYPE_HOST */
-        u_int64_t        serial;
-        char            *key_id;
-        u_int            nprincipals;
-        char            **principals;
-        u_int64_t        valid_after, valid_before;
-        Buffer           critical;
-        Buffer           extensions;
-        Key             *signature_key;
-};
-
-struct Key {
-        int      type;
-        int      flags;
-        RSA     *rsa;
-        DSA     *dsa;
-        int      ecdsa_nid;     /* NID of curve */
-#ifdef OPENSSL_HAS_ECC
-        EC_KEY  *ecdsa;
-#else
-        void    *ecdsa;
-#endif
-        struct KeyCert *cert;
-        u_char  *ed25519_sk;
-        u_char  *ed25519_pk;
-};
-
-#define ED25519_SK_SZ   crypto_sign_ed25519_SECRETKEYBYTES
-#define ED25519_PK_SZ   crypto_sign_ed25519_PUBLICKEYBYTES
-
-Key             *key_new(int);
-void             key_add_private(Key *);
-Key             *key_new_private(int);
-void             key_free(Key *);
-Key             *key_demote(const Key *);
-int              key_equal_public(const Key *, const Key *);
-int              key_equal(const Key *, const Key *);
-char            *key_fingerprint(const Key *, enum fp_type, enum fp_rep);
-u_char          *key_fingerprint_raw(const Key *, enum fp_type, u_int *);
-const char      *key_type(const Key *);
-const char      *key_cert_type(const Key *);
-int              key_write(const Key *, FILE *);
-int              key_read(Key *, char **);
-u_int            key_size(const Key *);
+void     key_add_private(Key *);
+Key     *key_new_private(int);
+void     key_free(Key *);
+Key     *key_demote(const Key *);
+u_char  *key_fingerprint_raw(const Key *, enum fp_type, u_int *);
+int      key_write(const Key *, FILE *);
+int      key_read(Key *, char **);
 
 Key     *key_generate(int, u_int);
 Key     *key_from_private(const Key *);
-int      key_type_from_name(char *);
-int      key_is_cert(const Key *);
-int      key_type_is_cert(int);
-int      key_type_plain(int);
 int      key_to_certified(Key *, int);
 int      key_drop_cert(Key *);
 int      key_certify(Key *, Key *);
-void     key_cert_copy(const Key *, struct Key *);
+void     key_cert_copy(const Key *, Key *);
 int      key_cert_check_authority(const Key *, int, int, const char *,
             const char **);
-int      key_cert_is_legacy(const Key *);
+char    *key_alg_list(int, int);
 
-int              key_ecdsa_nid_from_name(const char *);
-int              key_curve_name_to_nid(const char *);
-const char      *key_curve_nid_to_name(int);
-u_int            key_curve_nid_to_bits(int);
-int              key_ecdsa_bits_to_nid(int);
-#ifdef OPENSSL_HAS_ECC
-int              key_ecdsa_key_to_nid(EC_KEY *);
-int              key_ec_nid_to_hash_alg(int nid);
-int              key_ec_validate_public(const EC_GROUP *, const EC_POINT *);
-int              key_ec_validate_private(const EC_KEY *);
-#endif
-char            *key_alg_list(int, int);
+#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
+int      key_ec_validate_public(const EC_GROUP *, const EC_POINT *);
+int      key_ec_validate_private(const EC_KEY *);
+#endif /* defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) */
 
-Key             *key_from_blob(const u_char *, u_int);
-int              key_to_blob(const Key *, u_char **, u_int *);
-const char      *key_ssh_name(const Key *);
-const char      *key_ssh_name_plain(const Key *);
-int              key_names_valid2(const char *);
+Key     *key_from_blob(const u_char *, u_int);
+int      key_to_blob(const Key *, u_char **, u_int *);
 
 int      key_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
 int      key_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
 
-int      ssh_dss_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
-int      ssh_dss_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
-int      ssh_ecdsa_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
-int      ssh_ecdsa_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
-int      ssh_rsa_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
-int      ssh_rsa_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
-int      ssh_ed25519_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
-int      ssh_ed25519_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
-
-#if defined(OPENSSL_HAS_ECC) && (defined(DEBUG_KEXECDH) || defined(DEBUG_PK))
-void    key_dump_ec_point(const EC_GROUP *, const EC_POINT *);
-void    key_dump_ec_key(const EC_KEY *);
-#endif
-
-void     key_private_serialize(const Key *, Buffer *);
-Key     *key_private_deserialize(Buffer *);
+void     key_private_serialize(const Key *, struct sshbuf *);
+Key     *key_private_deserialize(struct sshbuf *);
+
+/* authfile.c */
+int      key_save_private(Key *, const char *, const char *, const char *,
+    int, const char *, int);
+int      key_load_file(int, const char *, struct sshbuf *);
+Key     *key_load_cert(const char *);
+Key     *key_load_public(const char *, char **);
+Key     *key_load_private(const char *, const char *, char **);
+Key     *key_load_private_cert(int, const char *, const char *, int *);
+Key     *key_load_private_type(int, const char *, const char *, char **, int *);
+Key     *key_load_private_pem(int, int, const char *, char **);
+int      key_perm_ok(int, const char *);
+int      key_in_file(Key *, const char *, int);
 
 #endif