From c8e58b52150f7c13e3281d122ed2c3ff38b6a1d5 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 10 Jul 2014 22:45:58 +0000 Subject: Explicitly include 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/cms/cms.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libcrypto/cms/cms.h') diff --git a/src/lib/libcrypto/cms/cms.h b/src/lib/libcrypto/cms/cms.h index bacba68792..0e4aa6f9fc 100644 --- a/src/lib/libcrypto/cms/cms.h +++ b/src/lib/libcrypto/cms/cms.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cms.h,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms.h,v 1.5 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,10 +51,11 @@ * ==================================================================== */ - #ifndef HEADER_CMS_H #define HEADER_CMS_H +#include + #include #ifdef OPENSSL_NO_CMS @@ -65,7 +66,6 @@ extern "C" { #endif - typedef struct CMS_ContentInfo_st CMS_ContentInfo; typedef struct CMS_SignerInfo_st CMS_SignerInfo; typedef struct CMS_CertificateChoices CMS_CertificateChoices; -- cgit v1.2.3-55-g6feb