* 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).

1 files changed, 1 insertions, 3 deletions

diff --git a/mac.c b/mac.c
index 332d3c621..9b450e4e2 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mac.c,v 1.17 2011/12/02 00:43:57 djm Exp $ */
+/* $OpenBSD: mac.c,v 1.18 2012/06/28 05:07:45 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -61,9 +61,7 @@ struct {
         { "hmac-sha1-96",               SSH_EVP, EVP_sha1, 96, -1, -1 },
 #ifdef HAVE_EVP_SHA256
         { "hmac-sha2-256",              SSH_EVP, EVP_sha256, 0, -1, -1 },
-        { "hmac-sha2-256-96",           SSH_EVP, EVP_sha256, 96, -1, -1 },
         { "hmac-sha2-512",              SSH_EVP, EVP_sha512, 0, -1, -1 },
-        { "hmac-sha2-512-96",           SSH_EVP, EVP_sha512, 96, -1, -1 },
 #endif
         { "hmac-md5",                   SSH_EVP, EVP_md5, 0, -1, -1 },
         { "hmac-md5-96",                SSH_EVP, EVP_md5, 96, -1, -1 },