diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 22:56:08 +0100 |
commit | 31e30b835fd9695d3b6647cab4867001b092e28f (patch) | |
tree | 138e715c25661825457c7280cd66e3f4853d474c /authfile.h | |
parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) | |
parent | 43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff) |
merge 5.6p1
Diffstat (limited to 'authfile.h')
-rw-r--r-- | authfile.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/authfile.h b/authfile.h index 6dfa478e7..6745dc062 100644 --- a/authfile.h +++ b/authfile.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.h,v 1.14 2010/03/04 10:36:03 djm Exp $ */ | 1 | /* $OpenBSD: authfile.h,v 1.15 2010/08/04 05:42:47 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,9 +16,11 @@ | |||
16 | #define AUTHFILE_H | 16 | #define AUTHFILE_H |
17 | 17 | ||
18 | int key_save_private(Key *, const char *, const char *, const char *); | 18 | int key_save_private(Key *, const char *, const char *, const char *); |
19 | Key *key_load_cert(const char *); | ||
19 | Key *key_load_public(const char *, char **); | 20 | Key *key_load_public(const char *, char **); |
20 | Key *key_load_public_type(int, const char *, char **); | 21 | Key *key_load_public_type(int, const char *, char **); |
21 | Key *key_load_private(const char *, const char *, char **); | 22 | Key *key_load_private(const char *, const char *, char **); |
23 | Key *key_load_private_cert(int, const char *, const char *, int *); | ||
22 | Key *key_load_private_type(int, const char *, const char *, char **, int *); | 24 | Key *key_load_private_type(int, const char *, const char *, char **, int *); |
23 | Key *key_load_private_pem(int, int, const char *, char **); | 25 | Key *key_load_private_pem(int, int, const char *, char **); |
24 | int key_perm_ok(int, const char *); | 26 | int key_perm_ok(int, const char *); |