From 74e2c009c83ad374bd6acdcfc376a384e25ab007 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 11 Jul 2014 08:44:49 +0000 Subject: Only import cryptlib.h in the four source files that actually need it. Remove the openssl public includes from cryptlib.h and add a small number of includes into the source files that actually need them. While here, also sort/group/tidy the includes. ok beck@ miod@ --- src/lib/libcrypto/cms/cms_cd.c | 11 ++++++----- src/lib/libcrypto/cms/cms_dd.c | 8 ++++---- src/lib/libcrypto/cms/cms_enc.c | 10 +++++----- src/lib/libcrypto/cms/cms_env.c | 12 ++++++------ src/lib/libcrypto/cms/cms_ess.c | 8 ++++---- src/lib/libcrypto/cms/cms_pwri.c | 14 +++++++------- src/lib/libcrypto/cms/cms_sd.c | 10 +++++----- src/lib/libcrypto/cms/cms_smime.c | 8 ++++---- 8 files changed, 41 insertions(+), 40 deletions(-) (limited to 'src/lib/libcrypto/cms') diff --git a/src/lib/libcrypto/cms/cms_cd.c b/src/lib/libcrypto/cms/cms_cd.c index 2a67c5df30..bcf1506916 100644 --- a/src/lib/libcrypto/cms/cms_cd.c +++ b/src/lib/libcrypto/cms/cms_cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_cd.c,v 1.4 2014/07/10 22:45:56 jsing Exp $ */ +/* $OpenBSD: cms_cd.c,v 1.5 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -53,16 +53,17 @@ #include -#include "cryptlib.h" #include +#include +#include +#include #include #include -#include -#include -#include + #ifndef OPENSSL_NO_COMP #include #endif + #include "cms_lcl.h" DECLARE_ASN1_ITEM(CMS_CompressedData) diff --git a/src/lib/libcrypto/cms/cms_dd.c b/src/lib/libcrypto/cms/cms_dd.c index 7b1fff889a..eee25f5f07 100644 --- a/src/lib/libcrypto/cms/cms_dd.c +++ b/src/lib/libcrypto/cms/cms_dd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_dd.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_dd.c,v 1.4 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,12 +51,12 @@ * ==================================================================== */ -#include "cryptlib.h" #include +#include +#include #include #include -#include -#include + #include "cms_lcl.h" DECLARE_ASN1_ITEM(CMS_DigestedData) diff --git a/src/lib/libcrypto/cms/cms_enc.c b/src/lib/libcrypto/cms/cms_enc.c index faa1b14d4b..efe19a3131 100644 --- a/src/lib/libcrypto/cms/cms_enc.c +++ b/src/lib/libcrypto/cms/cms_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_enc.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_enc.c,v 1.5 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,13 +51,13 @@ * ==================================================================== */ -#include "cryptlib.h" #include -#include -#include -#include #include +#include +#include #include +#include + #include "cms_lcl.h" /* CMS EncryptedData Utilities */ diff --git a/src/lib/libcrypto/cms/cms_env.c b/src/lib/libcrypto/cms/cms_env.c index 2dd4e2faba..66ec1a9343 100644 --- a/src/lib/libcrypto/cms/cms_env.c +++ b/src/lib/libcrypto/cms/cms_env.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_env.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_env.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,14 +51,14 @@ * ==================================================================== */ -#include "cryptlib.h" +#include #include -#include -#include -#include #include +#include +#include #include -#include +#include + #include "cms_lcl.h" #include "asn1_locl.h" diff --git a/src/lib/libcrypto/cms/cms_ess.c b/src/lib/libcrypto/cms/cms_ess.c index f972ff3ee3..e3b7e7da4c 100644 --- a/src/lib/libcrypto/cms/cms_ess.c +++ b/src/lib/libcrypto/cms/cms_ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_ess.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_ess.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,13 +51,13 @@ * ==================================================================== */ -#include "cryptlib.h" #include +#include +#include #include #include #include -#include -#include + #include "cms_lcl.h" DECLARE_ASN1_ITEM(CMS_ReceiptRequest) diff --git a/src/lib/libcrypto/cms/cms_pwri.c b/src/lib/libcrypto/cms/cms_pwri.c index 04d0cb833f..ea3fbf87dd 100644 --- a/src/lib/libcrypto/cms/cms_pwri.c +++ b/src/lib/libcrypto/cms/cms_pwri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_pwri.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_pwri.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,16 +51,16 @@ * ==================================================================== */ -#include "cryptlib.h" +#include #include -#include -#include -#include #include +#include +#include #include -#include -#include "cms_lcl.h" +#include + #include "asn1_locl.h" +#include "cms_lcl.h" int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, unsigned char *pass, diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c index 0993502a1d..63c3f69bae 100644 --- a/src/lib/libcrypto/cms/cms_sd.c +++ b/src/lib/libcrypto/cms/cms_sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_sd.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_sd.c,v 1.6 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,14 +51,14 @@ * ==================================================================== */ -#include "cryptlib.h" #include +#include +#include #include #include -#include -#include -#include "cms_lcl.h" + #include "asn1_locl.h" +#include "cms_lcl.h" /* CMS SignedData Utilities */ diff --git a/src/lib/libcrypto/cms/cms_smime.c b/src/lib/libcrypto/cms/cms_smime.c index 049ef69d38..4f80561e5d 100644 --- a/src/lib/libcrypto/cms/cms_smime.c +++ b/src/lib/libcrypto/cms/cms_smime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_smime.c,v 1.10 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_smime.c,v 1.11 2014/07/11 08:44:48 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,12 +51,12 @@ * ==================================================================== */ -#include "cryptlib.h" #include +#include +#include #include #include -#include -#include + #include "cms_lcl.h" static int -- cgit v1.2.3-55-g6feb