From 2ae4f337b2a5fb2841b6b0053b49496fef844d1c Mon Sep 17 00:00:00 2001 From: "deraadt@openbsd.org" Date: Fri, 16 Jan 2015 06:40:12 +0000 Subject: upstream commit Replace with and other less dirty headers where possible. Annotate lines with their current reasons. Switch to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where sensible to avoid pulling in the pollution. These are the files confirmed through binary verification. ok guenther, millert, doug (helped with the verification protocol) --- sshkey.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sshkey.c') diff --git a/sshkey.c b/sshkey.c index add9f2b7..99c53bbc 100644 --- a/sshkey.c +++ b/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.12 2015/01/14 10:46:28 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.13 2015/01/16 06:40:12 deraadt Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -27,7 +27,7 @@ #include "includes.h" -#include +#include /* MIN MAX */ #include #include @@ -40,6 +40,7 @@ #include "crypto_api.h" #include +#include #include #include #include -- cgit v1.2.3