summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/crypto.h
diff options
context:
space:
mode:
authorjsing <>2014-07-10 22:45:58 +0000
committerjsing <>2014-07-10 22:45:58 +0000
commitc8e58b52150f7c13e3281d122ed2c3ff38b6a1d5 (patch)
tree9101caa8789c6a2612e96fe7996efbe84f28f5a9 /src/lib/libcrypto/crypto.h
parent81b6b7632b2207a2dbd7b6d803912ee3779176aa (diff)
downloadopenbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.tar.gz
openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.tar.bz2
openbsd-c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5.zip
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.
Diffstat (limited to 'src/lib/libcrypto/crypto.h')
-rw-r--r--src/lib/libcrypto/crypto.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 5bf87c9e2e..5cb1dda021 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */ 1/* $OpenBSD: crypto.h,v 1.32 2014/07/10 22:45:56 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -114,15 +114,14 @@
114 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. 114 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
115 */ 115 */
116 116
117#include <stdio.h>
118#include <stdlib.h>
119
117#ifndef HEADER_CRYPTO_H 120#ifndef HEADER_CRYPTO_H
118#define HEADER_CRYPTO_H 121#define HEADER_CRYPTO_H
119 122
120#include <stdlib.h>
121
122#include <openssl/opensslconf.h> 123#include <openssl/opensslconf.h>
123 124
124#include <stdio.h>
125
126#include <openssl/stack.h> 125#include <openssl/stack.h>
127#include <openssl/safestack.h> 126#include <openssl/safestack.h>
128#include <openssl/opensslv.h> 127#include <openssl/opensslv.h>