merge 5.4p1

1 files changed, 4 insertions, 2 deletions

diff --git a/auth.h b/auth.h
index 303c22d30..d4583f7ea 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.h,v 1.62 2008/11/04 08:22:12 djm Exp $ */
+/* $OpenBSD: auth.h,v 1.65 2010/03/04 10:36:03 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -172,6 +172,7 @@ char	*authorized_keys_file(struct passwd *);
 char    *authorized_keys_file2(struct passwd *);
 
 FILE    *auth_openkeyfile(const char *, struct passwd *, int);
+int      auth_key_is_revoked(Key *);
 
 HostStatus
 check_key_in_hostfiles(struct passwd *, Key *, const char *,
@@ -179,7 +180,8 @@ check_key_in_hostfiles(struct passwd *, Key *, const char *,
 
 /* hostkey handling */
 Key     *get_hostkey_by_index(int);
-Key     *get_hostkey_by_type(int);
+Key     *get_hostkey_public_by_type(int);
+Key     *get_hostkey_private_by_type(int);
 int      get_hostkey_index(Key *);
 int      ssh1_session_key(BIGNUM *);