* 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, 4 deletions

diff --git a/key.h b/key.h
index 4beaf202e..b57d6a4c4 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.h,v 1.35 2013/01/17 23:00:01 djm Exp $ */
+/* $OpenBSD: key.h,v 1.37 2013/05/19 02:42:42 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -96,7 +96,7 @@ 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(Key *, enum fp_type, enum fp_rep);
+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 *);
@@ -119,15 +119,16 @@ int	 key_cert_is_legacy(const Key *);
 
 int              key_ecdsa_nid_from_name(const char *);
 int              key_curve_name_to_nid(const char *);
-const char *     key_curve_nid_to_name(int);
+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 *);
-const EVP_MD *   key_ec_nid_to_evpmd(int nid);
+const EVP_MD    *key_ec_nid_to_evpmd(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(void);
 
 Key             *key_from_blob(const u_char *, u_int);
 int              key_to_blob(const Key *, u_char **, u_int *);