diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 20:16:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:19:39 +1100 |
commit | 57d10cbe861a235dd269c74fb2fe248469ecee9d (patch) | |
tree | c65deed24700490bd3b20300c4829d4d5466ff6d /auth.h | |
parent | 3fdc88a0def4f86aa88a5846ac079dc964c0546a (diff) |
upstream commit
adapt kex to sshbuf and struct ssh; ok djm@
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.79 2014/12/22 07:51:30 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.80 2015/01/19 20:16:15 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -42,6 +42,7 @@ | |||
42 | #include <krb5.h> | 42 | #include <krb5.h> |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | struct ssh; | ||
45 | struct sshkey; | 46 | struct sshkey; |
46 | 47 | ||
47 | typedef struct Authctxt Authctxt; | 48 | typedef struct Authctxt Authctxt; |
@@ -202,12 +203,12 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *, | |||
202 | 203 | ||
203 | /* hostkey handling */ | 204 | /* hostkey handling */ |
204 | Key *get_hostkey_by_index(int); | 205 | Key *get_hostkey_by_index(int); |
205 | Key *get_hostkey_public_by_index(int); | 206 | Key *get_hostkey_public_by_index(int, struct ssh *); |
206 | Key *get_hostkey_public_by_type(int); | 207 | Key *get_hostkey_public_by_type(int, struct ssh *); |
207 | Key *get_hostkey_private_by_type(int); | 208 | Key *get_hostkey_private_by_type(int, struct ssh *); |
208 | int get_hostkey_index(Key *); | 209 | int get_hostkey_index(Key *, struct ssh *); |
209 | int ssh1_session_key(BIGNUM *); | 210 | int ssh1_session_key(BIGNUM *); |
210 | void sshd_hostkey_sign(Key *, Key *, u_char **, u_int *, u_char *, u_int); | 211 | int sshd_hostkey_sign(Key *, Key *, u_char **, size_t *, u_char *, size_t, u_int); |
211 | 212 | ||
212 | /* debug messages during authentication */ | 213 | /* debug messages during authentication */ |
213 | void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); | 214 | void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); |