From f8e6fe02fc43958d79cf9326eebabf8ef8d3ae34 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 10 Jul 2014 13:58:23 +0000 Subject: Stop including standard headers via cryptlib.h - pull in the headers that are needed in the source files that actually require them. ok beck@ miod@ --- src/lib/libcrypto/evp/bio_b64.c | 6 ++++-- src/lib/libcrypto/evp/bio_enc.c | 6 ++++-- src/lib/libcrypto/evp/digest.c | 4 +++- src/lib/libcrypto/evp/e_des3.c | 5 +++-- src/lib/libcrypto/evp/e_null.c | 4 +++- src/lib/libcrypto/evp/e_xcbc_d.c | 4 +++- src/lib/libcrypto/evp/encode.c | 4 +++- src/lib/libcrypto/evp/evp_enc.c | 4 +++- src/lib/libcrypto/evp/evp_key.c | 4 +++- src/lib/libcrypto/evp/evp_lib.c | 4 +++- src/lib/libcrypto/evp/evp_pbe.c | 4 +++- src/lib/libcrypto/evp/p5_crpt.c | 4 +++- src/lib/libcrypto/evp/p5_crpt2.c | 5 ++++- src/lib/libcrypto/evp/pmeth_lib.c | 4 +++- 14 files changed, 45 insertions(+), 17 deletions(-) (limited to 'src/lib/libcrypto/evp') diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c index 2d8a6ef920..7211195adf 100644 --- a/src/lib/libcrypto/evp/bio_b64.c +++ b/src/lib/libcrypto/evp/bio_b64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_b64.c,v 1.16 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: bio_b64.c,v 1.17 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,8 +56,10 @@ * [including the GNU Public Licence.] */ -#include #include +#include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c index bcc45ea6d4..3b936f5843 100644 --- a/src/lib/libcrypto/evp/bio_enc.c +++ b/src/lib/libcrypto/evp/bio_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_enc.c,v 1.16 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: bio_enc.c,v 1.17 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,8 +56,10 @@ * [including the GNU Public Licence.] */ -#include #include +#include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/digest.c b/src/lib/libcrypto/evp/digest.c index f598e78911..5d5799a49f 100644 --- a/src/lib/libcrypto/evp/digest.c +++ b/src/lib/libcrypto/evp/digest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: digest.c,v 1.18 2014/06/15 15:46:22 jsing Exp $ */ +/* $OpenBSD: digest.c,v 1.19 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,6 +110,8 @@ */ #include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c index 211e525e99..41fa09a2d9 100644 --- a/src/lib/libcrypto/evp/e_des3.c +++ b/src/lib/libcrypto/evp/e_des3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_des3.c,v 1.13 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_des3.c,v 1.14 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #ifndef OPENSSL_NO_DES #include @@ -65,7 +67,6 @@ #include #include - static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); diff --git a/src/lib/libcrypto/evp/e_null.c b/src/lib/libcrypto/evp/e_null.c index 2c81de05d3..0d0a06f2e3 100644 --- a/src/lib/libcrypto/evp/e_null.c +++ b/src/lib/libcrypto/evp/e_null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_null.c,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_null.c,v 1.13 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c index 0f827a18d1..401fb2b766 100644 --- a/src/lib/libcrypto/evp/e_xcbc_d.c +++ b/src/lib/libcrypto/evp/e_xcbc_d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_xcbc_d.c,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_xcbc_d.c,v 1.10 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #ifndef OPENSSL_NO_DES diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c index 30c4a16803..a83cf76c9f 100644 --- a/src/lib/libcrypto/evp/encode.c +++ b/src/lib/libcrypto/evp/encode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encode.c,v 1.16 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: encode.c,v 1.17 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #include diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c index c384a3b225..36e39a4668 100644 --- a/src/lib/libcrypto/evp/evp_enc.c +++ b/src/lib/libcrypto/evp/evp_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_enc.c,v 1.21 2014/07/09 11:10:50 bcook Exp $ */ +/* $OpenBSD: evp_enc.c,v 1.22 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c index 322ded7e0a..0c5d9bc001 100644 --- a/src/lib/libcrypto/evp/evp_key.c +++ b/src/lib/libcrypto/evp/evp_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_key.c,v 1.15 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: evp_key.c,v 1.16 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/evp_lib.c b/src/lib/libcrypto/evp/evp_lib.c index a2ecdb8cf1..1664703288 100644 --- a/src/lib/libcrypto/evp/evp_lib.c +++ b/src/lib/libcrypto/evp/evp_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_lib.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: evp_lib.c,v 1.12 2014/07/10 13:58:22 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index de87ecce59..e53a681d5f 100644 --- a/src/lib/libcrypto/evp/evp_pbe.c +++ b/src/lib/libcrypto/evp/evp_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pbe.c,v 1.17 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.18 2014/07/10 13:58:22 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -57,6 +57,8 @@ */ #include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c index 9074d11d6b..1fe6edb143 100644 --- a/src/lib/libcrypto/evp/p5_crpt.c +++ b/src/lib/libcrypto/evp/p5_crpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_crpt.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: p5_crpt.c,v 1.12 2014/07/10 13:58:22 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -58,6 +58,8 @@ #include #include +#include + #include "cryptlib.h" #include #include diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c index 4593148591..3a182aabfd 100644 --- a/src/lib/libcrypto/evp/p5_crpt2.c +++ b/src/lib/libcrypto/evp/p5_crpt2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_crpt2.c,v 1.14 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: p5_crpt2.c,v 1.15 2014/07/10 13:58:22 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -55,8 +55,11 @@ * Hudson (tjh@cryptsoft.com). * */ + #include #include +#include + #include "cryptlib.h" #if !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA) #include diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c index 4f3cb9a45b..6f8515c670 100644 --- a/src/lib/libcrypto/evp/pmeth_lib.c +++ b/src/lib/libcrypto/evp/pmeth_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_lib.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: pmeth_lib.c,v 1.6 2014/07/10 13:58:22 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -58,6 +58,8 @@ #include #include +#include + #include "cryptlib.h" #include #include -- cgit v1.2.3-55-g6feb