merge 5.5p1

1 files changed, 2 insertions, 1 deletions

diff --git a/key.h b/key.h
index aaf4b56bd..69254cf12 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.h,v 1.28 2010/02/26 20:29:54 djm Exp $ */
+/* $OpenBSD: key.h,v 1.29 2010/03/15 19:40:02 stevesk Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -83,6 +83,7 @@ int		 key_equal(const Key *, const Key *);
 char            *key_fingerprint(Key *, enum fp_type, enum fp_rep);
 u_char          *key_fingerprint_raw(Key *, enum fp_type, u_int *);
 const char      *key_type(const Key *);
+const char      *key_cert_type(const Key *);
 int              key_write(const Key *, FILE *);
 int              key_read(Key *, char **);
 u_int            key_size(const Key *);