summaryrefslogtreecommitdiff
path: root/key.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
committerColin Watson <cjwatson@debian.org>2013-09-14 23:42:11 +0100
commit327155e6824b3ee13837bdde04e4eb47e147ff46 (patch)
tree8f8743122403c7a2e6ed919156711fb1520c657f /key.h
parent0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff)
parent74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff)
* 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).
Diffstat (limited to 'key.h')
-rw-r--r--key.h9
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 @@
1/* $OpenBSD: key.h,v 1.35 2013/01/17 23:00:01 djm Exp $ */ 1/* $OpenBSD: key.h,v 1.37 2013/05/19 02:42:42 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -96,7 +96,7 @@ void key_free(Key *);
96Key *key_demote(const Key *); 96Key *key_demote(const Key *);
97int key_equal_public(const Key *, const Key *); 97int key_equal_public(const Key *, const Key *);
98int key_equal(const Key *, const Key *); 98int key_equal(const Key *, const Key *);
99char *key_fingerprint(Key *, enum fp_type, enum fp_rep); 99char *key_fingerprint(const Key *, enum fp_type, enum fp_rep);
100u_char *key_fingerprint_raw(const Key *, enum fp_type, u_int *); 100u_char *key_fingerprint_raw(const Key *, enum fp_type, u_int *);
101const char *key_type(const Key *); 101const char *key_type(const Key *);
102const char *key_cert_type(const Key *); 102const char *key_cert_type(const Key *);
@@ -119,15 +119,16 @@ int key_cert_is_legacy(const Key *);
119 119
120int key_ecdsa_nid_from_name(const char *); 120int key_ecdsa_nid_from_name(const char *);
121int key_curve_name_to_nid(const char *); 121int key_curve_name_to_nid(const char *);
122const char * key_curve_nid_to_name(int); 122const char *key_curve_nid_to_name(int);
123u_int key_curve_nid_to_bits(int); 123u_int key_curve_nid_to_bits(int);
124int key_ecdsa_bits_to_nid(int); 124int key_ecdsa_bits_to_nid(int);
125#ifdef OPENSSL_HAS_ECC 125#ifdef OPENSSL_HAS_ECC
126int key_ecdsa_key_to_nid(EC_KEY *); 126int key_ecdsa_key_to_nid(EC_KEY *);
127const EVP_MD * key_ec_nid_to_evpmd(int nid); 127const EVP_MD *key_ec_nid_to_evpmd(int nid);
128int key_ec_validate_public(const EC_GROUP *, const EC_POINT *); 128int key_ec_validate_public(const EC_GROUP *, const EC_POINT *);
129int key_ec_validate_private(const EC_KEY *); 129int key_ec_validate_private(const EC_KEY *);
130#endif 130#endif
131char *key_alg_list(void);
131 132
132Key *key_from_blob(const u_char *, u_int); 133Key *key_from_blob(const u_char *, u_int);
133int key_to_blob(const Key *, u_char **, u_int *); 134int key_to_blob(const Key *, u_char **, u_int *);