diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-07 10:41:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-07 10:41:55 +1100 |
commit | bcd00abd8451f36142ae2ee10cc657202149201e (patch) | |
tree | 946db23f1ec607d9260e46b9f6f2422e0e9c970c /authfile.h | |
parent | f0e9060d236c0e38bec2fa1c6579fb0a2ea6458d (diff) |
- markus@cvs.openbsd.org 2013/12/06 13:34:54
[authfile.c authfile.h cipher.c cipher.h key.c packet.c ssh-agent.c]
[ssh-keygen.c PROTOCOL.key] new private key format, bcrypt as KDF by
default; details in PROTOCOL.key; feedback and lots help from djm;
ok djm@
Diffstat (limited to 'authfile.h')
-rw-r--r-- | authfile.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/authfile.h b/authfile.h index 78349beb5..8ba1c2dbe 100644 --- a/authfile.h +++ b/authfile.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.h,v 1.16 2011/05/04 21:15:29 djm Exp $ */ | 1 | /* $OpenBSD: authfile.h,v 1.17 2013/12/06 13:34:54 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -15,7 +15,8 @@ | |||
15 | #ifndef AUTHFILE_H | 15 | #ifndef AUTHFILE_H |
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, const char *, int); | ||
19 | int key_load_file(int, const char *, Buffer *); | 20 | int key_load_file(int, const char *, Buffer *); |
20 | Key *key_load_cert(const char *); | 21 | Key *key_load_cert(const char *); |
21 | Key *key_load_public(const char *, char **); | 22 | Key *key_load_public(const char *, char **); |