diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /auth.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.62 2008/11/04 08:22:12 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.65 2010/03/04 10:36:03 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -172,6 +172,7 @@ char *authorized_keys_file(struct passwd *); | |||
172 | char *authorized_keys_file2(struct passwd *); | 172 | char *authorized_keys_file2(struct passwd *); |
173 | 173 | ||
174 | FILE *auth_openkeyfile(const char *, struct passwd *, int); | 174 | FILE *auth_openkeyfile(const char *, struct passwd *, int); |
175 | int auth_key_is_revoked(Key *); | ||
175 | 176 | ||
176 | HostStatus | 177 | HostStatus |
177 | check_key_in_hostfiles(struct passwd *, Key *, const char *, | 178 | check_key_in_hostfiles(struct passwd *, Key *, const char *, |
@@ -179,7 +180,8 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *, | |||
179 | 180 | ||
180 | /* hostkey handling */ | 181 | /* hostkey handling */ |
181 | Key *get_hostkey_by_index(int); | 182 | Key *get_hostkey_by_index(int); |
182 | Key *get_hostkey_by_type(int); | 183 | Key *get_hostkey_public_by_type(int); |
184 | Key *get_hostkey_private_by_type(int); | ||
183 | int get_hostkey_index(Key *); | 185 | int get_hostkey_index(Key *); |
184 | int ssh1_session_key(BIGNUM *); | 186 | int ssh1_session_key(BIGNUM *); |
185 | 187 | ||