From c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 10 Jul 2014 22:45:58 +0000
Subject: Explicitly include <openssl/opensslconf.h> in every file that
 references an OPENSSL_NO_* define. This avoids relying on something else
 pulling it in for us, plus it fixes several cases where the #ifndef
 OPENSSL_NO_XYZ is never going to do anything, since OPENSSL_NO_XYZ will never
 defined, due to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.
---
 src/lib/libcrypto/sha/sha512.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/lib/libcrypto/sha/sha512.c')

diff --git a/src/lib/libcrypto/sha/sha512.c b/src/lib/libcrypto/sha/sha512.c
index 01ec6a6cde..eb10024e32 100644
--- a/src/lib/libcrypto/sha/sha512.c
+++ b/src/lib/libcrypto/sha/sha512.c
@@ -1,10 +1,17 @@
-/* $OpenBSD: sha512.c,v 1.11 2014/07/09 16:06:13 miod Exp $ */
+/* $OpenBSD: sha512.c,v 1.12 2014/07/10 22:45:58 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2004 The OpenSSL Project.  All rights reserved
  * according to the OpenSSL license [found in ../../LICENSE].
  * ====================================================================
  */
+
+#include <machine/endian.h>
+
+#include <stdlib.h>
+#include <string.h>
+
 #include <openssl/opensslconf.h>
+
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA512)
 /*
  * IMPLEMENTATION NOTES.
@@ -41,9 +48,6 @@
  * 16-bit platforms.
  *					<appro@fy.chalmers.se>
  */
-#include <stdlib.h>
-#include <string.h>
-#include <machine/endian.h>
 
 #include <openssl/crypto.h>
 #include <openssl/sha.h>
-- 
cgit v1.2.3-55-g6feb