diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-05 14:17:18 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-05 14:17:18 +1000 |
commit | 2ce12ef1ac96c47b386168459cf7264fdc6faf95 (patch) | |
tree | f22a2364e250199fc1c83504b8489a37665c3607 /authfile.h | |
parent | 8cb1cda1e3a24c6f73b96822f36762c1c80ae147 (diff) |
- djm@cvs.openbsd.org 2011/05/04 21:15:29
[authfile.c authfile.h ssh-add.c]
allow "ssh-add - < key"; feedback and ok markus@
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 6745dc062..78349beb5 100644 --- a/authfile.h +++ b/authfile.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.h,v 1.15 2010/08/04 05:42:47 djm Exp $ */ | 1 | /* $OpenBSD: authfile.h,v 1.16 2011/05/04 21:15:29 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 | int key_load_file(int, const char *, Buffer *); | ||
19 | Key *key_load_cert(const char *); | 20 | Key *key_load_cert(const char *); |
20 | Key *key_load_public(const char *, char **); | 21 | Key *key_load_public(const char *, char **); |
21 | Key *key_load_public_type(int, const char *, char **); | 22 | Key *key_load_public_type(int, const char *, char **); |
23 | Key *key_parse_private(Buffer *, const char *, const char *, char **); | ||
22 | Key *key_load_private(const char *, const char *, char **); | 24 | Key *key_load_private(const char *, const char *, char **); |
23 | Key *key_load_private_cert(int, const char *, const char *, int *); | 25 | Key *key_load_private_cert(int, const char *, const char *, int *); |
24 | Key *key_load_private_type(int, const char *, const char *, char **, int *); | 26 | Key *key_load_private_type(int, const char *, const char *, char **, int *); |