* New upstream release (http://www.openssh.org/txt/release-5.8):

  - Fix stack information leak in legacy certificate signing
    (http://www.openssh.com/txt/legacy-cert.adv).

2 files changed, 11 insertions, 12 deletions

diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index a2498dc15..dc8b1fa55 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.11 2011/01/17 07:50:24 dtucker Exp $ */
+/* $Id: port-linux.c,v 1.11.4.2 2011/02/04 00:43:08 djm Exp $ */
 
 /*
  * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -222,17 +222,16 @@ ssh_selinux_change_context(const char *newname)
 void
 ssh_selinux_setfscreatecon(const char *path)
 {
-                security_context_t context;
+        security_context_t context;
 
-                if (!ssh_selinux_enabled())
-                        return;
-
-                if (path == NULL) {
-                        setfscreatecon(NULL);
-                        return;
-                }
-                if (matchpathcon(path, 0700, &context) == 0)
-                        setfscreatecon(context);
+        if (!ssh_selinux_enabled())
+                return;
+        if (path == NULL) {
+                setfscreatecon(NULL);
+                return;
+        }
+        if (matchpathcon(path, 0700, &context) == 0)
+                setfscreatecon(context);
 }
 
 #endif /* WITH_SELINUX */
diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
index 8ed5587ee..3804fa2d1 100644
--- a/openbsd-compat/port-linux.h
+++ b/openbsd-compat/port-linux.h
@@ -1,4 +1,4 @@
-/* $Id: port-linux.h,v 1.4 2009/12/08 02:39:48 dtucker Exp $ */
+/* $Id: port-linux.h,v 1.4.10.1 2011/02/04 00:42:21 djm Exp $ */
 
 /*
  * Copyright (c) 2006 Damien Miller <djm@openbsd.org>