summaryrefslogtreecommitdiff
path: root/auth.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-08-06 10:49:59 +0100
committerColin Watson <cjwatson@debian.org>2016-08-07 12:18:58 +0100
commit477bb7636238c106f8cd7c868a8c0c5eabcfb3db (patch)
tree601176af2ecf358c36b766776a86845ad7a3cd6f /auth.h
parent747fac2de0d889183f67f6900194c0462c558544 (diff)
parent4c914ccd85bbf391c4dc61b85e3c178fef465e3f (diff)
New upstream release (7.3p1).
Diffstat (limited to 'auth.h')
-rw-r--r--auth.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/auth.h b/auth.h
index 3b3a0853e..50baeaadb 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.86 2015/12/04 16:41:28 markus Exp $ */ 1/* $OpenBSD: auth.h,v 1.88 2016/05/04 14:04:40 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -125,7 +125,8 @@ BIGNUM *auth_rsa_generate_challenge(Key *);
125int auth_rsa_verify_response(Key *, BIGNUM *, u_char[]); 125int auth_rsa_verify_response(Key *, BIGNUM *, u_char[]);
126int auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **); 126int auth_rsa_key_allowed(struct passwd *, BIGNUM *, Key **);
127 127
128int auth_rhosts_rsa_key_allowed(struct passwd *, char *, char *, Key *); 128int auth_rhosts_rsa_key_allowed(struct passwd *, const char *,
129 const char *, Key *);
129int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); 130int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
130int user_key_allowed(struct passwd *, Key *, int); 131int user_key_allowed(struct passwd *, Key *, int);
131void pubkey_auth_info(Authctxt *, const Key *, const char *, ...) 132void pubkey_auth_info(Authctxt *, const Key *, const char *, ...)
@@ -198,6 +199,8 @@ FILE *auth_openkeyfile(const char *, struct passwd *, int);
198FILE *auth_openprincipals(const char *, struct passwd *, int); 199FILE *auth_openprincipals(const char *, struct passwd *, int);
199int auth_key_is_revoked(Key *); 200int auth_key_is_revoked(Key *);
200 201
202const char *auth_get_canonical_hostname(struct ssh *, int);
203
201HostStatus 204HostStatus
202check_key_in_hostfiles(struct passwd *, Key *, const char *, 205check_key_in_hostfiles(struct passwd *, Key *, const char *,
203 const char *, const char *); 206 const char *, const char *);