diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
commit | 2ea3f720daeb1ca9f765365fce3a9546961fe624 (patch) | |
tree | c4fb7d1f51fa51e7677232de806aae150e29e2ac /key.h | |
parent | f5efcd3450bbf8261915e0c4a6f851229dddaa79 (diff) | |
parent | ecebda56da46a03dafff923d91c382f31faa9eec (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.2).
- Add support for multiple required authentication in SSH protocol 2 via
an AuthenticationMethods option (closes: #195716).
- Fix Sophie Germain formula in moduli(5) (closes: #698612).
- Update ssh-copy-id to Phil Hands' greatly revised version (closes:
#99785, #322228, #620428; LP: #518883, #835901, #1074798).
Diffstat (limited to 'key.h')
-rw-r--r-- | key.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: key.h,v 1.34 2012/05/23 03:28:28 djm Exp $ */ | 1 | /* $OpenBSD: key.h,v 1.35 2013/01/17 23:00:01 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. |
@@ -97,7 +97,7 @@ Key *key_demote(const Key *); | |||
97 | int key_equal_public(const Key *, const Key *); | 97 | int key_equal_public(const Key *, const Key *); |
98 | int key_equal(const Key *, const Key *); | 98 | int key_equal(const Key *, const Key *); |
99 | char *key_fingerprint(Key *, enum fp_type, enum fp_rep); | 99 | char *key_fingerprint(Key *, enum fp_type, enum fp_rep); |
100 | u_char *key_fingerprint_raw(Key *, enum fp_type, u_int *); | 100 | u_char *key_fingerprint_raw(const Key *, enum fp_type, u_int *); |
101 | const char *key_type(const Key *); | 101 | const char *key_type(const Key *); |
102 | const char *key_cert_type(const Key *); | 102 | const char *key_cert_type(const Key *); |
103 | int key_write(const Key *, FILE *); | 103 | int key_write(const Key *, FILE *); |
@@ -115,7 +115,7 @@ int key_certify(Key *, Key *); | |||
115 | void key_cert_copy(const Key *, struct Key *); | 115 | void key_cert_copy(const Key *, struct Key *); |
116 | int key_cert_check_authority(const Key *, int, int, const char *, | 116 | int key_cert_check_authority(const Key *, int, int, const char *, |
117 | const char **); | 117 | const char **); |
118 | int key_cert_is_legacy(Key *); | 118 | int key_cert_is_legacy(const Key *); |
119 | 119 | ||
120 | int key_ecdsa_nid_from_name(const char *); | 120 | int key_ecdsa_nid_from_name(const char *); |
121 | int key_curve_name_to_nid(const char *); | 121 | int key_curve_name_to_nid(const char *); |