summaryrefslogtreecommitdiff
path: root/key.c
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.c
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.c')
-rw-r--r--key.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/key.c b/key.c
index 3a652b9af..2a16b25b9 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: key.c,v 1.98 2011/10/18 04:58:26 djm Exp $ */ 1/* $OpenBSD: key.c,v 1.99 2012/05/23 03:28:28 djm Exp $ */
2/* 2/*
3 * read_bignum(): 3 * read_bignum():
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -342,6 +342,11 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length)
342 case SSH_FP_SHA1: 342 case SSH_FP_SHA1:
343 md = EVP_sha1(); 343 md = EVP_sha1();
344 break; 344 break;
345#ifdef HAVE_EVP_SHA256
346 case SSH_FP_SHA256:
347 md = EVP_sha256();
348 break;
349#endif
345 default: 350 default:
346 fatal("key_fingerprint_raw: bad digest type %d", 351 fatal("key_fingerprint_raw: bad digest type %d",
347 dgst_type); 352 dgst_type);