summaryrefslogtreecommitdiff
path: root/key.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
committerColin Watson <cjwatson@debian.org>2012-09-07 00:20:47 +0100
commiteab78da6a54225de06271d9c8da650f04a55ed88 (patch)
treeaa258ca77515939f6d89317ff67fbcb0bca08b24 /key.h
parenta26f5de49df59322fde07f7be91b3e3969c9c238 (diff)
parentc6a2c0334e45419875687d250aed9bea78480f2e (diff)
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs. - Allow "PermitOpen none" to refuse all port-forwarding requests (closes: #543683).
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 8b5c5659c..ca56b4271 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.h,v 1.33 2010/10/28 11:22:09 djm Exp $ */ 1/* $OpenBSD: key.h,v 1.34 2012/05/23 03:28:28 djm 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.
@@ -49,7 +49,8 @@ enum types {
49}; 49};
50enum fp_type { 50enum fp_type {
51 SSH_FP_SHA1, 51 SSH_FP_SHA1,
52 SSH_FP_MD5 52 SSH_FP_MD5,
53 SSH_FP_SHA256
53}; 54};
54enum fp_rep { 55enum fp_rep {
55 SSH_FP_HEX, 56 SSH_FP_HEX,