* New upstream release (http://www.openssh.com/txt/release-6.3).

  - sftp(1): add support for resuming partial downloads using the "reget"
    command and on the sftp commandline or on the "get" commandline using
    the "-a" (append) option (closes: #158590).
  - ssh(1): add an "IgnoreUnknown" configuration option to selectively
    suppress errors arising from unknown configuration directives (closes:
    #436052).
  - sftp(1): update progressmeter when data is acknowledged, not when it's
    sent (partially addresses #708372).
  - ssh(1): do not fatally exit when attempting to cleanup multiplexing-
    created channels that are incompletely opened (closes: #651357).

1 files changed, 8 insertions, 9 deletions

diff --git a/kex.h b/kex.h
index 8013ab8a4..d5046c627 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.54 2013/01/08 18:49:04 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.56 2013/07/19 07:37:48 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -40,8 +40,9 @@
 #define KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"
 #define KEX_DHGEX_SHA256        "diffie-hellman-group-exchange-sha256"
 #define KEX_RESUME              "resume@appgate.com"
-/* The following represents the family of ECDH methods */
-#define KEX_ECDH_SHA2_STEM      "ecdh-sha2-"
+#define KEX_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"
+#define KEX_ECDH_SHA2_NISTP384  "ecdh-sha2-nistp384"
+#define KEX_ECDH_SHA2_NISTP521  "ecdh-sha2-nistp521"
 
 #define COMP_NONE       0
 #define COMP_ZLIB       1
@@ -89,7 +90,7 @@ typedef struct Newkeys Newkeys;
 
 struct Enc {
         char    *name;
-        Cipher  *cipher;
+        const Cipher *cipher;
         int     enabled;
         u_int   key_len;
         u_int   iv_len;
@@ -134,6 +135,7 @@ struct Kex {
         sig_atomic_t done;
         int     flags;
         const EVP_MD *evp_md;
+        int     ec_nid;
 #ifdef GSSAPI
         int     gss_deleg_creds;
         int     gss_trust_dns;
@@ -146,10 +148,12 @@ struct Kex {
         Key     *(*load_host_public_key)(int);
         Key     *(*load_host_private_key)(int);
         int     (*host_key_index)(Key *);
+        void    (*sign)(Key *, Key *, u_char **, u_int *, u_char *, u_int);
         void    (*kex[KEX_MAX])(Kex *);
 };
 
 int      kex_names_valid(const char *);
+char    *kex_alg_list(void);
 
 Kex     *kex_setup(char *[PROPOSAL_MAX]);
 void     kex_finish(Kex *);
@@ -184,11 +188,6 @@ void
 kex_ecdh_hash(const EVP_MD *, const EC_GROUP *, char *, char *, char *, int,
     char *, int, u_char *, int, const EC_POINT *, const EC_POINT *,
     const BIGNUM *, u_char **, u_int *);
-int     kex_ecdh_name_to_nid(const char *);
-const EVP_MD *kex_ecdh_name_to_evpmd(const char *);
-#else
-# define kex_ecdh_name_to_nid(x) (-1)
-# define kex_ecdh_name_to_evpmd(x) (NULL)
 #endif
 
 void