summaryrefslogtreecommitdiff
path: root/auth.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2015-08-19 14:23:51 +0100
committerColin Watson <cjwatson@debian.org>2015-08-19 16:48:11 +0100
commit0f0841b2d28b7463267d4d91577e72e3340a1d3a (patch)
treeba55fcd2b6e2cc22b30f5afb561dbb3da4c8b6c7 /auth.h
parentf2a5f5dae656759efb0b76c3d94890b65c197a02 (diff)
parent8698446b972003b63dfe5dcbdb86acfe986afb85 (diff)
New upstream release (6.8p1).
Diffstat (limited to 'auth.h')
-rw-r--r--auth.h21
1 files changed, 15 insertions, 6 deletions
diff --git a/auth.h b/auth.h
index f099e9807..4985cd86c 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.78 2014/07/03 11:16:55 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.
@@ -42,6 +42,9 @@
42#include <krb5.h> 42#include <krb5.h>
43#endif 43#endif
44 44
45struct ssh;
46struct sshkey;
47
45typedef struct Authctxt Authctxt; 48typedef struct Authctxt Authctxt;
46typedef struct Authmethod Authmethod; 49typedef struct Authmethod Authmethod;
47typedef struct KbdintDevice KbdintDevice; 50typedef struct KbdintDevice KbdintDevice;
@@ -76,6 +79,9 @@ struct Authctxt {
76#endif 79#endif
77 Buffer *loginmsg; 80 Buffer *loginmsg;
78 void *methoddata; 81 void *methoddata;
82
83 struct sshkey **prev_userkeys;
84 u_int nprev_userkeys;
79}; 85};
80/* 86/*
81 * Every authentication method has to handle authentication requests for 87 * Every authentication method has to handle authentication requests for
@@ -124,6 +130,8 @@ int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
124int user_key_allowed(struct passwd *, Key *); 130int user_key_allowed(struct passwd *, Key *);
125void pubkey_auth_info(Authctxt *, const Key *, const char *, ...) 131void pubkey_auth_info(Authctxt *, const Key *, const char *, ...)
126 __attribute__((__format__ (printf, 3, 4))); 132 __attribute__((__format__ (printf, 3, 4)));
133void auth2_record_userkey(Authctxt *, struct sshkey *);
134int auth2_userkey_already_used(Authctxt *, struct sshkey *);
127 135
128struct stat; 136struct stat;
129int auth_secure_path(const char *, struct stat *, const char *, uid_t, 137int auth_secure_path(const char *, struct stat *, const char *, uid_t,
@@ -196,12 +204,13 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *,
196 204
197/* hostkey handling */ 205/* hostkey handling */
198Key *get_hostkey_by_index(int); 206Key *get_hostkey_by_index(int);
199Key *get_hostkey_public_by_index(int); 207Key *get_hostkey_public_by_index(int, struct ssh *);
200Key *get_hostkey_public_by_type(int); 208Key *get_hostkey_public_by_type(int, int, struct ssh *);
201Key *get_hostkey_private_by_type(int); 209Key *get_hostkey_private_by_type(int, int, struct ssh *);
202int get_hostkey_index(Key *); 210int get_hostkey_index(Key *, int, struct ssh *);
203int ssh1_session_key(BIGNUM *); 211int ssh1_session_key(BIGNUM *);
204void sshd_hostkey_sign(Key *, Key *, u_char **, u_int *, u_char *, u_int); 212int sshd_hostkey_sign(Key *, Key *, u_char **, size_t *,
213 const u_char *, size_t, u_int);
205 214
206/* debug messages during authentication */ 215/* debug messages during authentication */
207void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2))); 216void auth_debug_add(const char *fmt,...) __attribute__((format(printf, 1, 2)));