diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-02-16 22:13:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-02-17 09:32:32 +1100 |
commit | 523463a3a2a9bfc6cfc5afa01bae9147f76a37cc (patch) | |
tree | 772be92cee9553c19d51b4570113c3d4de0c2d8b /auth.h | |
parent | 6c5c949782d86a6e7d58006599c7685bfcd01685 (diff) |
upstream commit
Revise hostkeys@openssh.com hostkey learning extension.
The client will not ask the server to prove ownership of the private
halves of any hitherto-unseen hostkeys it offers to the client.
Allow UpdateHostKeys option to take an 'ask' argument to let the
user manually review keys offered.
ok markus@
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.81 2015/01/26 06:10:03 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.82 2015/02/16 22:13:32 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -206,9 +206,10 @@ Key *get_hostkey_by_index(int); | |||
206 | Key *get_hostkey_public_by_index(int, struct ssh *); | 206 | Key *get_hostkey_public_by_index(int, struct ssh *); |
207 | Key *get_hostkey_public_by_type(int, int, struct ssh *); | 207 | Key *get_hostkey_public_by_type(int, int, struct ssh *); |
208 | Key *get_hostkey_private_by_type(int, int, struct ssh *); | 208 | Key *get_hostkey_private_by_type(int, int, struct ssh *); |
209 | int get_hostkey_index(Key *, struct ssh *); | 209 | int get_hostkey_index(Key *, int, struct ssh *); |
210 | int ssh1_session_key(BIGNUM *); | 210 | int ssh1_session_key(BIGNUM *); |
211 | int sshd_hostkey_sign(Key *, Key *, u_char **, size_t *, u_char *, size_t, u_int); | 211 | int sshd_hostkey_sign(Key *, Key *, u_char **, size_t *, |
212 | const u_char *, size_t, u_int); | ||
212 | 213 | ||
213 | /* debug messages during authentication */ | 214 | /* debug messages during authentication */ |
214 | void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); | 215 | void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); |