summaryrefslogtreecommitdiff
path: root/key.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:42:53 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:42:53 +0000
commit87552344215a38d3a2b0d4d63dc151e05978bbe1 (patch)
tree9f4b96055e6ccaa915e8d59d9f2805e9e119371d /key.h
parenta25ec0b132c44c9e341e08464ff830de06b81126 (diff)
parentef94e5613d37bcbf880f21ee6094e4b1c7683a4c (diff)
import openssh-5.1p1-gsskex-cjwatson-20080722.patch
Diffstat (limited to 'key.h')
-rw-r--r--key.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/key.h b/key.h
index 40576f3d7..db609d326 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.h,v 1.26 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: key.h,v 1.27 2008/06/11 21:01:35 grunk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -43,7 +43,8 @@ enum fp_type {
43}; 43};
44enum fp_rep { 44enum fp_rep {
45 SSH_FP_HEX, 45 SSH_FP_HEX,
46 SSH_FP_BUBBLEBABBLE 46 SSH_FP_BUBBLEBABBLE,
47 SSH_FP_RANDOMART
47}; 48};
48 49
49/* key is stored in external hardware */ 50/* key is stored in external hardware */