merge 6.1p1

1 files changed, 3 insertions, 2 deletions

diff --git a/key.h b/key.h
index 8b5c5659c..ca56b4271 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.h,v 1.33 2010/10/28 11:22:09 djm Exp $ */
+/* $OpenBSD: key.h,v 1.34 2012/05/23 03:28:28 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -49,7 +49,8 @@ enum types {
 };
 enum fp_type {
         SSH_FP_SHA1,
-        SSH_FP_MD5
+        SSH_FP_MD5,
+        SSH_FP_SHA256
 };
 enum fp_rep {
         SSH_FP_HEX,