* 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, 5 insertions, 8 deletions

diff --git a/kexecdhc.c b/kexecdhc.c
index 115d4bf83..6193836c7 100644
--- a/kexecdhc.c
+++ b/kexecdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdhc.c,v 1.2 2010/09/22 05:01:29 djm Exp $ */
+/* $OpenBSD: kexecdhc.c,v 1.4 2013/05/17 00:13:13 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -57,11 +57,8 @@ kexecdh_client(Kex *kex)
         u_char *server_host_key_blob = NULL, *signature = NULL;
         u_char *kbuf, *hash;
         u_int klen, slen, sbloblen, hashlen;
-        int curve_nid;
 
-        if ((curve_nid = kex_ecdh_name_to_nid(kex->name)) == -1)
-                fatal("%s: unsupported ECDH curve \"%s\"", __func__, kex->name);
-        if ((client_key = EC_KEY_new_by_curve_name(curve_nid)) == NULL)
+        if ((client_key = EC_KEY_new_by_curve_name(kex->ec_nid)) == NULL)
                 fatal("%s: EC_KEY_new_by_curve_name failed", __func__);
         if (EC_KEY_generate_key(client_key) != 1)
                 fatal("%s: EC_KEY_generate_key failed", __func__);
@@ -123,7 +120,7 @@ kexecdh_client(Kex *kex)
         if (BN_bin2bn(kbuf, klen, shared_secret) == NULL)
                 fatal("%s: BN_bin2bn failed", __func__);
         memset(kbuf, 0, klen);
-        xfree(kbuf);
+        free(kbuf);
 
         /* calc and verify H */
         kex_ecdh_hash(
@@ -139,14 +136,14 @@ kexecdh_client(Kex *kex)
             shared_secret,
             &hash, &hashlen
         );
-        xfree(server_host_key_blob);
+        free(server_host_key_blob);
         EC_POINT_clear_free(server_public);
         EC_KEY_free(client_key);
 
         if (key_verify(server_host_key, signature, slen, hash, hashlen) != 1)
                 fatal("key_verify failed for server_host_key");
         key_free(server_host_key);
-        xfree(signature);
+        free(signature);
 
         /* save session id */
         if (kex->session_id == NULL) {