diff options
Diffstat (limited to 'lib/libssl/src/crypto')
197 files changed, 731 insertions, 275 deletions
diff --git a/lib/libssl/src/crypto/asn1/ameth_lib.c b/lib/libssl/src/crypto/asn1/ameth_lib.c index 0c5edd5c62f..43981277c46 100644 --- a/lib/libssl/src/crypto/asn1/ameth_lib.c +++ b/lib/libssl/src/crypto/asn1/ameth_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ameth_lib.c,v 1.10 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: ameth_lib.c,v 1.11 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/asn1t.h> #include <openssl/x509.h> diff --git a/lib/libssl/src/crypto/asn1/asn1_err.c b/lib/libssl/src/crypto/asn1/asn1_err.c index 7afe894e7d1..40b1ad85797 100644 --- a/lib/libssl/src/crypto/asn1/asn1_err.c +++ b/lib/libssl/src/crypto/asn1/asn1_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1_err.c,v 1.17 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: asn1_err.c,v 1.18 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/asn1.h> diff --git a/lib/libssl/src/crypto/asn1/d2i_pr.c b/lib/libssl/src/crypto/asn1/d2i_pr.c index 0633b60d06b..3e140c05f51 100644 --- a/lib/libssl/src/crypto/asn1/d2i_pr.c +++ b/lib/libssl/src/crypto/asn1/d2i_pr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d2i_pr.c,v 1.10 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: d2i_pr.c,v 1.11 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/asn1/d2i_pu.c b/lib/libssl/src/crypto/asn1/d2i_pu.c index 7f0ad0e1a4e..4a9475b68e3 100644 --- a/lib/libssl/src/crypto/asn1/d2i_pu.c +++ b/lib/libssl/src/crypto/asn1/d2i_pu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d2i_pu.c,v 1.10 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: d2i_pu.c,v 1.11 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/asn1/i2d_pu.c b/lib/libssl/src/crypto/asn1/i2d_pu.c index 5b3e96ec961..0f0369f3a52 100644 --- a/lib/libssl/src/crypto/asn1/i2d_pu.c +++ b/lib/libssl/src/crypto/asn1/i2d_pu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i2d_pu.c,v 1.8 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: i2d_pu.c,v 1.9 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/asn1/n_pkey.c b/lib/libssl/src/crypto/asn1/n_pkey.c index c9a507ca41b..b2047bd5864 100644 --- a/lib/libssl/src/crypto/asn1/n_pkey.c +++ b/lib/libssl/src/crypto/asn1/n_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: n_pkey.c,v 1.19 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: n_pkey.c,v 1.20 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> diff --git a/lib/libssl/src/crypto/asn1/t_req.c b/lib/libssl/src/crypto/asn1/t_req.c index e84d53399ac..689df1e203f 100644 --- a/lib/libssl/src/crypto/asn1/t_req.c +++ b/lib/libssl/src/crypto/asn1/t_req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t_req.c,v 1.15 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: t_req.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/bn.h> diff --git a/lib/libssl/src/crypto/asn1/t_spki.c b/lib/libssl/src/crypto/asn1/t_spki.c index d6f86d1e2fc..91d275ffc2a 100644 --- a/lib/libssl/src/crypto/asn1/t_spki.c +++ b/lib/libssl/src/crypto/asn1/t_spki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t_spki.c,v 1.9 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: t_spki.c,v 1.10 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/x509.h> #include <openssl/asn1.h> diff --git a/lib/libssl/src/crypto/asn1/t_x509.c b/lib/libssl/src/crypto/asn1/t_x509.c index b294ffc6374..690015b1c16 100644 --- a/lib/libssl/src/crypto/asn1/t_x509.c +++ b/lib/libssl/src/crypto/asn1/t_x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t_x509.c,v 1.22 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: t_x509.c,v 1.23 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/bn.h> diff --git a/lib/libssl/src/crypto/asn1/x_crl.c b/lib/libssl/src/crypto/asn1/x_crl.c index eda938f6269..13402a66c29 100644 --- a/lib/libssl/src/crypto/asn1/x_crl.c +++ b/lib/libssl/src/crypto/asn1/x_crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_crl.c,v 1.15 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: x_crl.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "asn1_locl.h" #include <openssl/asn1t.h> diff --git a/lib/libssl/src/crypto/asn1/x_pubkey.c b/lib/libssl/src/crypto/asn1/x_pubkey.c index b308b3d4451..f702bdbe97a 100644 --- a/lib/libssl/src/crypto/asn1/x_pubkey.c +++ b/lib/libssl/src/crypto/asn1/x_pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_pubkey.c,v 1.19 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: x_pubkey.c,v 1.20 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/asn1t.h> #include <openssl/x509.h> diff --git a/lib/libssl/src/crypto/asn1/x_x509.c b/lib/libssl/src/crypto/asn1/x_x509.c index 28f51f68733..43772f9ac1b 100644 --- a/lib/libssl/src/crypto/asn1/x_x509.c +++ b/lib/libssl/src/crypto/asn1/x_x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_x509.c,v 1.15 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: x_x509.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/asn1t.h> diff --git a/lib/libssl/src/crypto/bio/bio_err.c b/lib/libssl/src/crypto/bio/bio_err.c index 8307c1099fe..80788585ba1 100644 --- a/lib/libssl/src/crypto/bio/bio_err.c +++ b/lib/libssl/src/crypto/bio/bio_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bio_err.c,v 1.15 2014/06/22 14:41:10 jsing Exp $ */ +/* $OpenBSD: bio_err.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/bio.h> diff --git a/lib/libssl/src/crypto/bio/bss_dgram.c b/lib/libssl/src/crypto/bio/bss_dgram.c index d06406aebd6..d56b71ba27f 100644 --- a/lib/libssl/src/crypto/bio/bss_dgram.c +++ b/lib/libssl/src/crypto/bio/bss_dgram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_dgram.c,v 1.29 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: bss_dgram.c,v 1.30 2014/07/10 22:45:56 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -67,6 +67,8 @@ #include <string.h> #include <unistd.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bio.h> diff --git a/lib/libssl/src/crypto/bio/bss_fd.c b/lib/libssl/src/crypto/bio/bss_fd.c index 60efde91c9d..6e8e8d08159 100644 --- a/lib/libssl/src/crypto/bio/bss_fd.c +++ b/lib/libssl/src/crypto/bio/bss_fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_fd.c,v 1.15 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: bss_fd.c,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,6 +61,8 @@ #include <string.h> #include <unistd.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #if defined(OPENSSL_NO_POSIX_IO) diff --git a/lib/libssl/src/crypto/bn/bn_asm.c b/lib/libssl/src/crypto/bn/bn_asm.c index d33919f0aa1..01e03cc81fe 100644 --- a/lib/libssl/src/crypto/bn/bn_asm.c +++ b/lib/libssl/src/crypto/bn/bn_asm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_asm.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_asm.c,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,8 +61,11 @@ # define NDEBUG #endif -#include <stdio.h> #include <assert.h> +#include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/libssl/src/crypto/bn/bn_blind.c b/lib/libssl/src/crypto/bn/bn_blind.c index 6bcd8d0ecad..2170181aae5 100644 --- a/lib/libssl/src/crypto/bn/bn_blind.c +++ b/lib/libssl/src/crypto/bn/bn_blind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_blind.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_blind.c,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -110,6 +110,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/libssl/src/crypto/bn/bn_ctx.c b/lib/libssl/src/crypto/bn/bn_ctx.c index 95871258d92..d3384a03855 100644 --- a/lib/libssl/src/crypto/bn/bn_ctx.c +++ b/lib/libssl/src/crypto/bn/bn_ctx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_ctx.c,v 1.11 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: bn_ctx.c,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Ulf Moeller for the OpenSSL project. */ /* ==================================================================== * Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved. @@ -64,6 +64,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/libssl/src/crypto/bn/bn_depr.c b/lib/libssl/src/crypto/bn/bn_depr.c index 83297f4a497..93af852aa53 100644 --- a/lib/libssl/src/crypto/bn/bn_depr.c +++ b/lib/libssl/src/crypto/bn/bn_depr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_depr.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_depr.c,v 1.5 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -58,6 +58,9 @@ #include <stdio.h> #include <time.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" #include <openssl/rand.h> diff --git a/lib/libssl/src/crypto/bn/bn_div.c b/lib/libssl/src/crypto/bn/bn_div.c index 2f45a412b46..40a3c1551d4 100644 --- a/lib/libssl/src/crypto/bn/bn_div.c +++ b/lib/libssl/src/crypto/bn/bn_div.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_div.c,v 1.20 2014/06/27 22:02:07 miod Exp $ */ +/* $OpenBSD: bn_div.c,v 1.21 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,6 +58,9 @@ #include <stdio.h> #include <openssl/bn.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/libssl/src/crypto/bn/bn_err.c b/lib/libssl/src/crypto/bn/bn_err.c index 032786b4e8f..5a0f359d86c 100644 --- a/lib/libssl/src/crypto/bn/bn_err.c +++ b/lib/libssl/src/crypto/bn/bn_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_err.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_err.c,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/bn.h> diff --git a/lib/libssl/src/crypto/bn/bn_gf2m.c b/lib/libssl/src/crypto/bn/bn_gf2m.c index 7aa306c345b..09d4bcc5442 100644 --- a/lib/libssl/src/crypto/bn/bn_gf2m.c +++ b/lib/libssl/src/crypto/bn/bn_gf2m.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_gf2m.c,v 1.13 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_gf2m.c,v 1.14 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -91,6 +91,9 @@ #include <assert.h> #include <limits.h> #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/libssl/src/crypto/bn/bn_lcl.h b/lib/libssl/src/crypto/bn/bn_lcl.h index f90402fb5b2..2dab445a517 100644 --- a/lib/libssl/src/crypto/bn/bn_lcl.h +++ b/lib/libssl/src/crypto/bn/bn_lcl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_lcl.h,v 1.19 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_lcl.h,v 1.20 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -112,6 +112,8 @@ #ifndef HEADER_BN_LCL_H #define HEADER_BN_LCL_H +#include <openssl/opensslconf.h> + #include <openssl/bn.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/bn/bn_lib.c b/lib/libssl/src/crypto/bn/bn_lib.c index a33cf99ddb4..747cbb68a5b 100644 --- a/lib/libssl/src/crypto/bn/bn_lib.c +++ b/lib/libssl/src/crypto/bn/bn_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_lib.c,v 1.30 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: bn_lib.c,v 1.31 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -66,6 +66,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/libssl/src/crypto/bn/bn_mul.c b/lib/libssl/src/crypto/bn/bn_mul.c index 721fac19b11..71bfe2d9ecc 100644 --- a/lib/libssl/src/crypto/bn/bn_mul.c +++ b/lib/libssl/src/crypto/bn/bn_mul.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_mul.c,v 1.17 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: bn_mul.c,v 1.18 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,6 +65,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "bn_lcl.h" diff --git a/lib/libssl/src/crypto/bn/bn_print.c b/lib/libssl/src/crypto/bn/bn_print.c index 6893d9af8b8..db51887fbe2 100644 --- a/lib/libssl/src/crypto/bn/bn_print.c +++ b/lib/libssl/src/crypto/bn/bn_print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_print.c,v 1.20 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: bn_print.c,v 1.21 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,10 +56,14 @@ * [including the GNU Public Licence.] */ -#include <stdio.h> #include <ctype.h> -#include "cryptlib.h" +#include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/buffer.h> + +#include "cryptlib.h" #include "bn_lcl.h" static const char Hex[]="0123456789ABCDEF"; diff --git a/lib/libssl/src/crypto/buffer/buf_err.c b/lib/libssl/src/crypto/buffer/buf_err.c index c311588dca1..8256e89843a 100644 --- a/lib/libssl/src/crypto/buffer/buf_err.c +++ b/lib/libssl/src/crypto/buffer/buf_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf_err.c,v 1.9 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: buf_err.c,v 1.10 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/buffer.h> diff --git a/lib/libssl/src/crypto/camellia/camellia.c b/lib/libssl/src/crypto/camellia/camellia.c index 27ce0fbc87d..f400bc9ff7e 100644 --- a/lib/libssl/src/crypto/camellia/camellia.c +++ b/lib/libssl/src/crypto/camellia/camellia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: camellia.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: camellia.c,v 1.7 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . * ALL RIGHTS RESERVED. @@ -81,10 +81,12 @@ * words reasonable performance even with not so modern compilers. */ +#include <stdlib.h> +#include <string.h> +#include <openssl/opensslconf.h> + #include "camellia.h" #include "cmll_locl.h" -#include <string.h> -#include <stdlib.h> /* 32-bit rotations */ #if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) diff --git a/lib/libssl/src/crypto/cast/cast.h b/lib/libssl/src/crypto/cast/cast.h index 4759d4c782a..1043c7f24f4 100644 --- a/lib/libssl/src/crypto/cast/cast.h +++ b/lib/libssl/src/crypto/cast/cast.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cast.h,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cast.h,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,12 +59,12 @@ #ifndef HEADER_CAST_H #define HEADER_CAST_H +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif -#include <openssl/opensslconf.h> - #ifdef OPENSSL_NO_CAST #error CAST is disabled. #endif diff --git a/lib/libssl/src/crypto/cms/cms.h b/lib/libssl/src/crypto/cms/cms.h index bacba68792d..0e4aa6f9fce 100644 --- a/lib/libssl/src/crypto/cms/cms.h +++ b/lib/libssl/src/crypto/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 <openssl/opensslconf.h> + #include <openssl/x509.h> #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; diff --git a/lib/libssl/src/crypto/cms/cms_cd.c b/lib/libssl/src/crypto/cms/cms_cd.c index 59c7224c053..2a67c5df308 100644 --- a/lib/libssl/src/crypto/cms/cms_cd.c +++ b/lib/libssl/src/crypto/cms/cms_cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_cd.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_cd.c,v 1.4 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -51,6 +51,8 @@ * ==================================================================== */ +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/asn1t.h> #include <openssl/pem.h> diff --git a/lib/libssl/src/crypto/cms/cms_err.c b/lib/libssl/src/crypto/cms/cms_err.c index 9d3fd8803fd..4eb9188fd29 100644 --- a/lib/libssl/src/crypto/cms/cms_err.c +++ b/lib/libssl/src/crypto/cms/cms_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cms_err.c,v 1.3 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: cms_err.c,v 1.4 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2009 The OpenSSL Project. All rights reserved. * @@ -59,8 +59,11 @@ */ #include <stdio.h> -#include <openssl/err.h> + +#include <openssl/opensslconf.h> + #include <openssl/cms.h> +#include <openssl/err.h> /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/lib/libssl/src/crypto/comp/comp_err.c b/lib/libssl/src/crypto/comp/comp_err.c index ced13233e17..1174df430fa 100644 --- a/lib/libssl/src/crypto/comp/comp_err.c +++ b/lib/libssl/src/crypto/comp/comp_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comp_err.c,v 1.7 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: comp_err.c,v 1.8 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,8 +59,11 @@ */ #include <stdio.h> -#include <openssl/err.h> + +#include <openssl/opensslconf.h> + #include <openssl/comp.h> +#include <openssl/err.h> /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/lib/libssl/src/crypto/conf/conf_err.c b/lib/libssl/src/crypto/conf/conf_err.c index 5694103a791..a1a7cbe42e1 100644 --- a/lib/libssl/src/crypto/conf/conf_err.c +++ b/lib/libssl/src/crypto/conf/conf_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_err.c,v 1.11 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_err.c,v 1.12 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,8 +59,11 @@ */ #include <stdio.h> -#include <openssl/err.h> + +#include <openssl/opensslconf.h> + #include <openssl/conf.h> +#include <openssl/err.h> /* BEGIN ERROR CODES */ #ifndef OPENSSL_NO_ERR diff --git a/lib/libssl/src/crypto/conf/conf_mall.c b/lib/libssl/src/crypto/conf/conf_mall.c index e964b84df07..5eef7a7d185 100644 --- a/lib/libssl/src/crypto/conf/conf_mall.c +++ b/lib/libssl/src/crypto/conf/conf_mall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_mall.c,v 1.7 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_mall.c,v 1.8 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/conf.h> diff --git a/lib/libssl/src/crypto/conf/conf_sap.c b/lib/libssl/src/crypto/conf/conf_sap.c index 7c46b2476fa..332b48ba5a3 100644 --- a/lib/libssl/src/crypto/conf/conf_sap.c +++ b/lib/libssl/src/crypto/conf/conf_sap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_sap.c,v 1.8 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: conf_sap.c,v 1.9 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/conf.h> diff --git a/lib/libssl/src/crypto/cpt_err.c b/lib/libssl/src/crypto/cpt_err.c index 6bc8ec16427..4ac32a28ec8 100644 --- a/lib/libssl/src/crypto/cpt_err.c +++ b/lib/libssl/src/crypto/cpt_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpt_err.c,v 1.12 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: cpt_err.c,v 1.13 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/crypto.h> diff --git a/lib/libssl/src/crypto/cryptlib.c b/lib/libssl/src/crypto/cryptlib.c index 75d66d4ee98..30023af3322 100644 --- a/lib/libssl/src/crypto/cryptlib.c +++ b/lib/libssl/src/crypto/cryptlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptlib.c,v 1.30 2014/07/10 22:13:39 jsing Exp $ */ +/* $OpenBSD: cryptlib.c,v 1.31 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -117,6 +117,8 @@ #include <string.h> #include <unistd.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/safestack.h> diff --git a/lib/libssl/src/crypto/crypto.h b/lib/libssl/src/crypto/crypto.h index 5bf87c9e2e4..5cb1dda0219 100644 --- a/lib/libssl/src/crypto/crypto.h +++ b/lib/libssl/src/crypto/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */ +/* $OpenBSD: crypto.h,v 1.32 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -114,15 +114,14 @@ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. */ +#include <stdio.h> +#include <stdlib.h> + #ifndef HEADER_CRYPTO_H #define HEADER_CRYPTO_H -#include <stdlib.h> - #include <openssl/opensslconf.h> -#include <stdio.h> - #include <openssl/stack.h> #include <openssl/safestack.h> #include <openssl/opensslv.h> diff --git a/lib/libssl/src/crypto/des/des_locl.h b/lib/libssl/src/crypto/des/des_locl.h index 7b086ff01d0..477aeb60d92 100644 --- a/lib/libssl/src/crypto/des/des_locl.h +++ b/lib/libssl/src/crypto/des/des_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: des_locl.h,v 1.15 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: des_locl.h,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,12 +59,11 @@ #ifndef HEADER_DES_LOCL_H #define HEADER_DES_LOCL_H +#include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> - #include <unistd.h> -#include <math.h> #include <openssl/opensslconf.h> diff --git a/lib/libssl/src/crypto/des/enc_read.c b/lib/libssl/src/crypto/des/enc_read.c index b4e9fe9383b..b358fadd48a 100644 --- a/lib/libssl/src/crypto/des/enc_read.c +++ b/lib/libssl/src/crypto/des/enc_read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_read.c,v 1.12 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: enc_read.c,v 1.13 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,6 +58,9 @@ #include <stdio.h> #include <errno.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "des_locl.h" diff --git a/lib/libssl/src/crypto/des/enc_writ.c b/lib/libssl/src/crypto/des/enc_writ.c index d93756bd350..0e3a2d856a7 100644 --- a/lib/libssl/src/crypto/des/enc_writ.c +++ b/lib/libssl/src/crypto/des/enc_writ.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_writ.c,v 1.10 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: enc_writ.c,v 1.11 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,8 +57,11 @@ */ #include <errno.h> -#include <time.h> #include <stdio.h> +#include <time.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "des_locl.h" #include <openssl/rand.h> diff --git a/lib/libssl/src/crypto/dh/dh_depr.c b/lib/libssl/src/crypto/dh/dh_depr.c index bc7ba16f2b1..13f2029a59b 100644 --- a/lib/libssl/src/crypto/dh/dh_depr.c +++ b/lib/libssl/src/crypto/dh/dh_depr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_depr.c,v 1.4 2014/07/09 13:26:47 miod Exp $ */ +/* $OpenBSD: dh_depr.c,v 1.5 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -53,10 +53,12 @@ * */ - /* This file contains deprecated functions as wrappers to the new ones */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/dh.h> diff --git a/lib/libssl/src/crypto/dh/dh_err.c b/lib/libssl/src/crypto/dh/dh_err.c index 989459fbdf1..3774ba3c45f 100644 --- a/lib/libssl/src/crypto/dh/dh_err.c +++ b/lib/libssl/src/crypto/dh/dh_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_err.c,v 1.14 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: dh_err.c,v 1.15 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/dh.h> diff --git a/lib/libssl/src/crypto/dh/dh_lib.c b/lib/libssl/src/crypto/dh/dh_lib.c index 094a78041dc..1cf14061c91 100644 --- a/lib/libssl/src/crypto/dh/dh_lib.c +++ b/lib/libssl/src/crypto/dh/dh_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh_lib.c,v 1.17 2014/07/09 13:26:47 miod Exp $ */ +/* $OpenBSD: dh_lib.c,v 1.18 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/dh.h> diff --git a/lib/libssl/src/crypto/dsa/dsa_ameth.c b/lib/libssl/src/crypto/dsa/dsa_ameth.c index 06b804b19d9..1f08585e5f4 100644 --- a/lib/libssl/src/crypto/dsa/dsa_ameth.c +++ b/lib/libssl/src/crypto/dsa/dsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_ameth.c,v 1.10 2014/07/09 22:55:17 tedu Exp $ */ +/* $OpenBSD: dsa_ameth.c,v 1.11 2014/07/10 22:45:56 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/x509.h> #include <openssl/asn1.h> diff --git a/lib/libssl/src/crypto/dsa/dsa_depr.c b/lib/libssl/src/crypto/dsa/dsa_depr.c index 50169ac9b2c..d8ac6f9d925 100644 --- a/lib/libssl/src/crypto/dsa/dsa_depr.c +++ b/lib/libssl/src/crypto/dsa/dsa_depr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_depr.c,v 1.4 2014/07/09 10:16:24 miod Exp $ */ +/* $OpenBSD: dsa_depr.c,v 1.5 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -56,10 +56,13 @@ /* This file contains deprecated function(s) that are now wrappers to the new * version(s). */ -#ifndef OPENSSL_NO_SHA - #include <stdio.h> #include <time.h> + +#include <openssl/opensslconf.h> + +#ifndef OPENSSL_NO_SHA + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/bn.h> diff --git a/lib/libssl/src/crypto/dsa/dsa_err.c b/lib/libssl/src/crypto/dsa/dsa_err.c index b01e59344b6..b116b643c3e 100644 --- a/lib/libssl/src/crypto/dsa/dsa_err.c +++ b/lib/libssl/src/crypto/dsa/dsa_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_err.c,v 1.13 2014/06/12 15:49:28 deraadt Exp $ */ +/* $OpenBSD: dsa_err.c,v 1.14 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/dsa.h> diff --git a/lib/libssl/src/crypto/dsa/dsa_key.c b/lib/libssl/src/crypto/dsa/dsa_key.c index 2d11f59107e..723e1888df4 100644 --- a/lib/libssl/src/crypto/dsa/dsa_key.c +++ b/lib/libssl/src/crypto/dsa/dsa_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_key.c,v 1.16 2014/07/09 10:16:24 miod Exp $ */ +/* $OpenBSD: dsa_key.c,v 1.17 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,6 +58,9 @@ #include <stdio.h> #include <time.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_SHA #include <openssl/bn.h> diff --git a/lib/libssl/src/crypto/dsa/dsa_lib.c b/lib/libssl/src/crypto/dsa/dsa_lib.c index 19f80687f87..3bf8427d4ca 100644 --- a/lib/libssl/src/crypto/dsa/dsa_lib.c +++ b/lib/libssl/src/crypto/dsa/dsa_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_lib.c,v 1.18 2014/07/09 11:10:50 bcook Exp $ */ +/* $OpenBSD: dsa_lib.c,v 1.19 2014/07/10 22:45:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,9 @@ /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/dsa.h> diff --git a/lib/libssl/src/crypto/dso/dso_err.c b/lib/libssl/src/crypto/dso/dso_err.c index 7cf6e7aa9e4..b8514a4aefc 100644 --- a/lib/libssl/src/crypto/dso/dso_err.c +++ b/lib/libssl/src/crypto/dso/dso_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dso_err.c,v 1.7 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: dso_err.c,v 1.8 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/dso.h> diff --git a/lib/libssl/src/crypto/ec/ec2_mult.c b/lib/libssl/src/crypto/ec/ec2_mult.c index 6df193d0d49..6c3a759dc8b 100644 --- a/lib/libssl/src/crypto/ec/ec2_mult.c +++ b/lib/libssl/src/crypto/ec/ec2_mult.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec2_mult.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec2_mult.c,v 1.4 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -67,6 +67,8 @@ * */ +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include "ec_lcl.h" diff --git a/lib/libssl/src/crypto/ec/ec2_oct.c b/lib/libssl/src/crypto/ec/ec2_oct.c index 15066beae45..5150423b993 100644 --- a/lib/libssl/src/crypto/ec/ec2_oct.c +++ b/lib/libssl/src/crypto/ec/ec2_oct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec2_oct.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec2_oct.c,v 1.4 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -67,6 +67,8 @@ * */ +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include "ec_lcl.h" diff --git a/lib/libssl/src/crypto/ec/ec2_smpl.c b/lib/libssl/src/crypto/ec/ec2_smpl.c index fc2e4ca7bc6..001ffcc0774 100644 --- a/lib/libssl/src/crypto/ec/ec2_smpl.c +++ b/lib/libssl/src/crypto/ec/ec2_smpl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec2_smpl.c,v 1.10 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec2_smpl.c,v 1.11 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -67,6 +67,8 @@ * */ +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include "ec_lcl.h" diff --git a/lib/libssl/src/crypto/ec/ec_ameth.c b/lib/libssl/src/crypto/ec/ec_ameth.c index 31ea95f1031..6935972de58 100644 --- a/lib/libssl/src/crypto/ec/ec_ameth.c +++ b/lib/libssl/src/crypto/ec/ec_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_ameth.c,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec_ameth.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/x509.h> #include <openssl/ec.h> diff --git a/lib/libssl/src/crypto/ec/ec_asn1.c b/lib/libssl/src/crypto/ec/ec_asn1.c index 9478e5260a6..ef87b599f2c 100644 --- a/lib/libssl/src/crypto/ec/ec_asn1.c +++ b/lib/libssl/src/crypto/ec/ec_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_asn1.c,v 1.8 2014/07/01 21:26:27 miod Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.9 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -57,12 +57,14 @@ */ #include <string.h> + +#include <openssl/opensslconf.h> + #include "ec_lcl.h" #include <openssl/err.h> #include <openssl/asn1t.h> #include <openssl/objects.h> - int EC_GROUP_get_basis_type(const EC_GROUP * group) { diff --git a/lib/libssl/src/crypto/ec/ec_curve.c b/lib/libssl/src/crypto/ec/ec_curve.c index 32a7301bf9b..baac8c7156e 100644 --- a/lib/libssl/src/crypto/ec/ec_curve.c +++ b/lib/libssl/src/crypto/ec/ec_curve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_curve.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec_curve.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -69,10 +69,11 @@ * */ +#include <openssl/opensslconf.h> + #include "ec_lcl.h" #include <openssl/err.h> #include <openssl/obj_mac.h> -#include <openssl/opensslconf.h> typedef struct { int field_type, /* either NID_X9_62_prime_field or diff --git a/lib/libssl/src/crypto/ec/ec_cvt.c b/lib/libssl/src/crypto/ec/ec_cvt.c index 7b70cf79687..a0982064b89 100644 --- a/lib/libssl/src/crypto/ec/ec_cvt.c +++ b/lib/libssl/src/crypto/ec/ec_cvt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_cvt.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec_cvt.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -69,10 +69,11 @@ * */ +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include "ec_lcl.h" - EC_GROUP * EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) diff --git a/lib/libssl/src/crypto/ec/ec_err.c b/lib/libssl/src/crypto/ec/ec_err.c index 7620a05d849..0ba510adae1 100644 --- a/lib/libssl/src/crypto/ec/ec_err.c +++ b/lib/libssl/src/crypto/ec/ec_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_err.c,v 1.8 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec_err.c,v 1.9 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/ec.h> diff --git a/lib/libssl/src/crypto/ec/ec_key.c b/lib/libssl/src/crypto/ec/ec_key.c index 939176095fe..7067a949da3 100644 --- a/lib/libssl/src/crypto/ec/ec_key.c +++ b/lib/libssl/src/crypto/ec/ec_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_key.c,v 1.7 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec_key.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -62,6 +62,9 @@ */ #include <string.h> + +#include <openssl/opensslconf.h> + #include "ec_lcl.h" #include <openssl/err.h> diff --git a/lib/libssl/src/crypto/ec/ec_lib.c b/lib/libssl/src/crypto/ec/ec_lib.c index f2a4fb8053e..3d8b96eb1f3 100644 --- a/lib/libssl/src/crypto/ec/ec_lib.c +++ b/lib/libssl/src/crypto/ec/ec_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_lib.c,v 1.13 2014/07/09 11:10:50 bcook Exp $ */ +/* $OpenBSD: ec_lib.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -63,6 +63,8 @@ #include <string.h> +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/opensslv.h> diff --git a/lib/libssl/src/crypto/ec/ec_oct.c b/lib/libssl/src/crypto/ec/ec_oct.c index cd07890c746..82124a8f80f 100644 --- a/lib/libssl/src/crypto/ec/ec_oct.c +++ b/lib/libssl/src/crypto/ec/ec_oct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_oct.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ec_oct.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -63,6 +63,8 @@ #include <string.h> +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/opensslv.h> diff --git a/lib/libssl/src/crypto/ec/eck_prn.c b/lib/libssl/src/crypto/ec/eck_prn.c index eba10245d8f..fb5ee7f52bf 100644 --- a/lib/libssl/src/crypto/ec/eck_prn.c +++ b/lib/libssl/src/crypto/ec/eck_prn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eck_prn.c,v 1.7 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: eck_prn.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -64,6 +64,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/ec.h> diff --git a/lib/libssl/src/crypto/ec/ecp_nistp224.c b/lib/libssl/src/crypto/ec/ecp_nistp224.c index 473d75a72b6..c466d2db83c 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistp224.c +++ b/lib/libssl/src/crypto/ec/ecp_nistp224.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nistp224.c,v 1.13 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecp_nistp224.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Emilia Kasper (Google) for the OpenSSL project. */ @@ -25,12 +25,13 @@ * and Adam Langley's public domain 64-bit C implementation of curve25519 */ +#include <stdint.h> +#include <string.h> + #include <openssl/opensslconf.h> -#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#include <stdint.h> +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#include <string.h> #include <openssl/err.h> #include "ec_lcl.h" diff --git a/lib/libssl/src/crypto/ec/ecp_nistp256.c b/lib/libssl/src/crypto/ec/ecp_nistp256.c index a72b1163ffd..7b122e63071 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistp256.c +++ b/lib/libssl/src/crypto/ec/ecp_nistp256.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nistp256.c,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecp_nistp256.c,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Adam Langley (Google) for the OpenSSL project */ @@ -26,12 +26,13 @@ * work which got its smarts from Daniel J. Bernstein's work on the same. */ +#include <stdint.h> +#include <string.h> + #include <openssl/opensslconf.h> -#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#include <stdint.h> +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#include <string.h> #include <openssl/err.h> #include "ec_lcl.h" diff --git a/lib/libssl/src/crypto/ec/ecp_nistp521.c b/lib/libssl/src/crypto/ec/ecp_nistp521.c index 1ff3837411f..cec0a3b470f 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistp521.c +++ b/lib/libssl/src/crypto/ec/ecp_nistp521.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nistp521.c,v 1.13 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecp_nistp521.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Adam Langley (Google) for the OpenSSL project */ @@ -26,12 +26,13 @@ * work which got its smarts from Daniel J. Bernstein's work on the same. */ +#include <stdint.h> +#include <string.h> + #include <openssl/opensslconf.h> -#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#include <stdint.h> +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 -#include <string.h> #include <openssl/err.h> #include "ec_lcl.h" diff --git a/lib/libssl/src/crypto/ec/ecp_nistputil.c b/lib/libssl/src/crypto/ec/ecp_nistputil.c index 87aa9792523..ca55b49ba29 100644 --- a/lib/libssl/src/crypto/ec/ecp_nistputil.c +++ b/lib/libssl/src/crypto/ec/ecp_nistputil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nistputil.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecp_nistputil.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Bodo Moeller for the OpenSSL project. */ @@ -18,14 +18,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <stddef.h> + #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 /* * Common utility functions for ecp_nistp224.c, ecp_nistp256.c, ecp_nistp521.c. */ -#include <stddef.h> #include "ec_lcl.h" /* Convert an array of points into affine coordinates. diff --git a/lib/libssl/src/crypto/ecdh/ech_err.c b/lib/libssl/src/crypto/ecdh/ech_err.c index c44f364a513..6b417a255d0 100644 --- a/lib/libssl/src/crypto/ecdh/ech_err.c +++ b/lib/libssl/src/crypto/ecdh/ech_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ech_err.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ech_err.c,v 1.3 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/ecdh.h> diff --git a/lib/libssl/src/crypto/ecdh/ech_lib.c b/lib/libssl/src/crypto/ecdh/ech_lib.c index 99390c2373e..e9fae9428ba 100644 --- a/lib/libssl/src/crypto/ecdh/ech_lib.c +++ b/lib/libssl/src/crypto/ecdh/ech_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ech_lib.c,v 1.6 2014/07/09 11:10:50 bcook Exp $ */ +/* $OpenBSD: ech_lib.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -67,8 +67,11 @@ * */ -#include "ech_locl.h" #include <string.h> + +#include <openssl/opensslconf.h> + +#include "ech_locl.h" #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif diff --git a/lib/libssl/src/crypto/ecdh/ech_ossl.c b/lib/libssl/src/crypto/ecdh/ech_ossl.c index dc99eec79e2..aa22ccafa21 100644 --- a/lib/libssl/src/crypto/ecdh/ech_ossl.c +++ b/lib/libssl/src/crypto/ecdh/ech_ossl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ech_ossl.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ech_ossl.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. * @@ -67,9 +67,10 @@ * */ - -#include <string.h> #include <limits.h> +#include <string.h> + +#include <openssl/opensslconf.h> #include "cryptlib.h" diff --git a/lib/libssl/src/crypto/ecdsa/ecs_err.c b/lib/libssl/src/crypto/ecdsa/ecs_err.c index b6297c2fbe3..721b53c3f4b 100644 --- a/lib/libssl/src/crypto/ecdsa/ecs_err.c +++ b/lib/libssl/src/crypto/ecdsa/ecs_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_err.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecs_err.c,v 1.3 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/ecdsa.h> diff --git a/lib/libssl/src/crypto/ecdsa/ecs_lib.c b/lib/libssl/src/crypto/ecdsa/ecs_lib.c index a1c05d1a414..a92d6117c93 100644 --- a/lib/libssl/src/crypto/ecdsa/ecs_lib.c +++ b/lib/libssl/src/crypto/ecdsa/ecs_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_lib.c,v 1.6 2014/07/09 11:10:50 bcook Exp $ */ +/* $OpenBSD: ecs_lib.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. * @@ -54,6 +54,9 @@ */ #include <string.h> + +#include <openssl/opensslconf.h> + #include "ecs_locl.h" #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/ecdsa/ecs_ossl.c b/lib/libssl/src/crypto/ecdsa/ecs_ossl.c index e44b435f2ac..e2c4b1d6d14 100644 --- a/lib/libssl/src/crypto/ecdsa/ecs_ossl.c +++ b/lib/libssl/src/crypto/ecdsa/ecs_ossl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_ossl.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecs_ossl.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project */ @@ -56,6 +56,8 @@ * */ +#include <openssl/opensslconf.h> + #include "ecs_locl.h" #include <openssl/err.h> #include <openssl/obj_mac.h> diff --git a/lib/libssl/src/crypto/ecdsa/ecs_sign.c b/lib/libssl/src/crypto/ecdsa/ecs_sign.c index 3444dd17031..39bcf5fe5c2 100644 --- a/lib/libssl/src/crypto/ecdsa/ecs_sign.c +++ b/lib/libssl/src/crypto/ecdsa/ecs_sign.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_sign.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecs_sign.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -53,6 +53,8 @@ * */ +#include <openssl/opensslconf.h> + #include "ecs_locl.h" #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/ecdsa/ecs_vrf.c b/lib/libssl/src/crypto/ecdsa/ecs_vrf.c index 9ff8e374a7e..40a677c46a9 100644 --- a/lib/libssl/src/crypto/ecdsa/ecs_vrf.c +++ b/lib/libssl/src/crypto/ecdsa/ecs_vrf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_vrf.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: ecs_vrf.c,v 1.3 2014/07/10 22:45:57 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project */ @@ -56,6 +56,8 @@ * */ +#include <openssl/opensslconf.h> + #include "ecs_locl.h" #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/engine/eng_aesni.c b/lib/libssl/src/crypto/engine/eng_aesni.c index d1b2d613b93..0bb558c1fd1 100644 --- a/lib/libssl/src/crypto/engine/eng_aesni.c +++ b/lib/libssl/src/crypto/engine/eng_aesni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_aesni.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: eng_aesni.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* * Support for Intel AES-NI intruction set * Author: Huang Ying <ying.huang@intel.com> @@ -73,13 +73,13 @@ * */ +#include <assert.h> +#include <stdio.h> #include <openssl/opensslconf.h> #if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AES_NI) && !defined(OPENSSL_NO_AES) -#include <stdio.h> -#include <assert.h> #include "cryptlib.h" #include <openssl/dso.h> #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/engine/eng_all.c b/lib/libssl/src/crypto/engine/eng_all.c index 086c903675c..21b76266c72 100644 --- a/lib/libssl/src/crypto/engine/eng_all.c +++ b/lib/libssl/src/crypto/engine/eng_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_all.c,v 1.25 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: eng_all.c,v 1.26 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Richard Levitte <richard@levitte.org> for the OpenSSL * project 2000. */ @@ -56,6 +56,8 @@ * */ +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include "eng_int.h" diff --git a/lib/libssl/src/crypto/engine/eng_err.c b/lib/libssl/src/crypto/engine/eng_err.c index 298c33f4858..d65efde9914 100644 --- a/lib/libssl/src/crypto/engine/eng_err.c +++ b/lib/libssl/src/crypto/engine/eng_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_err.c,v 1.9 2014/06/22 11:33:47 jsing Exp $ */ +/* $OpenBSD: eng_err.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2010 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/engine/eng_fat.c b/lib/libssl/src/crypto/engine/eng_fat.c index d995104a7ca..9805729922e 100644 --- a/lib/libssl/src/crypto/engine/eng_fat.c +++ b/lib/libssl/src/crypto/engine/eng_fat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_fat.c,v 1.13 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: eng_fat.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved. * @@ -60,6 +60,8 @@ #include <string.h> +#include <openssl/opensslconf.h> + #include "eng_int.h" #include <openssl/conf.h> diff --git a/lib/libssl/src/crypto/engine/eng_int.h b/lib/libssl/src/crypto/engine/eng_int.h index 22049fd7fde..aa3751f2677 100644 --- a/lib/libssl/src/crypto/engine/eng_int.h +++ b/lib/libssl/src/crypto/engine/eng_int.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_int.h,v 1.6 2014/06/22 12:16:28 jsing Exp $ */ +/* $OpenBSD: eng_int.h,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL * project 2000. */ @@ -65,6 +65,7 @@ #define HEADER_ENGINE_INT_H #include "cryptlib.h" + /* Take public definitions from engine.h */ #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/engine/eng_list.c b/lib/libssl/src/crypto/engine/eng_list.c index d7aef439993..35b45158e90 100644 --- a/lib/libssl/src/crypto/engine/eng_list.c +++ b/lib/libssl/src/crypto/engine/eng_list.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_list.c,v 1.13 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: eng_list.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL * project 2000. */ @@ -64,6 +64,8 @@ #include <string.h> #include <unistd.h> +#include <openssl/opensslconf.h> + #include "eng_int.h" /* The linked-list of pointers to engine types. engine_list_head diff --git a/lib/libssl/src/crypto/engine/eng_openssl.c b/lib/libssl/src/crypto/engine/eng_openssl.c index 882af0341f6..ecc560eb26e 100644 --- a/lib/libssl/src/crypto/engine/eng_openssl.c +++ b/lib/libssl/src/crypto/engine/eng_openssl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_openssl.c,v 1.7 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: eng_openssl.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL * project 2000. */ @@ -64,6 +64,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/engine/eng_padlock.c b/lib/libssl/src/crypto/engine/eng_padlock.c index 936a440b1a8..ca3c9580334 100644 --- a/lib/libssl/src/crypto/engine/eng_padlock.c +++ b/lib/libssl/src/crypto/engine/eng_padlock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_padlock.c,v 1.11 2014/06/22 12:05:09 jsing Exp $ */ +/* $OpenBSD: eng_padlock.c,v 1.12 2014/07/10 22:45:57 jsing Exp $ */ /* * Support for VIA PadLock Advanced Cryptography Engine (ACE) * Written by Michal Ludvig <michal@logix.cz> @@ -63,11 +63,11 @@ * */ - #include <stdio.h> #include <string.h> #include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include <openssl/dso.h> #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/engine/eng_rsax.c b/lib/libssl/src/crypto/engine/eng_rsax.c index 090ff3dfda6..daeb7e6ebbd 100644 --- a/lib/libssl/src/crypto/engine/eng_rsax.c +++ b/lib/libssl/src/crypto/engine/eng_rsax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eng_rsax.c,v 1.8 2014/06/22 12:18:33 jsing Exp $ */ +/* $OpenBSD: eng_rsax.c,v 1.9 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (c) 2010-2010 Intel Corp. * Author: Vinodh.Gopal@intel.com * Jim Guilford @@ -66,6 +66,9 @@ #include <stdio.h> #include <string.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/engine.h> diff --git a/lib/libssl/src/crypto/err/err.c b/lib/libssl/src/crypto/err/err.c index ee6d91f465e..cc9d78cb078 100644 --- a/lib/libssl/src/crypto/err/err.c +++ b/lib/libssl/src/crypto/err/err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err.c,v 1.36 2014/06/27 07:01:21 deraadt Exp $ */ +/* $OpenBSD: err.c,v 1.37 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -109,9 +109,12 @@ * */ -#include <stdio.h> #include <stdarg.h> +#include <stdio.h> #include <string.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/lhash.h> #include <openssl/crypto.h> diff --git a/lib/libssl/src/crypto/err/err_all.c b/lib/libssl/src/crypto/err/err_all.c index 0de1ced6fde..d950aad3b4b 100644 --- a/lib/libssl/src/crypto/err/err_all.c +++ b/lib/libssl/src/crypto/err/err_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err_all.c,v 1.15 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: err_all.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/asn1.h> #include <openssl/bn.h> #ifndef OPENSSL_NO_EC diff --git a/lib/libssl/src/crypto/evp/c_all.c b/lib/libssl/src/crypto/evp/c_all.c index cbbca62195a..d5afe8e94df 100644 --- a/lib/libssl/src/crypto/evp/c_all.c +++ b/lib/libssl/src/crypto/evp/c_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_all.c,v 1.13 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: c_all.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,6 +58,8 @@ #include <stdio.h> +#include <openssl/opensslconf.h> + #include <openssl/conf.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/c_allc.c b/lib/libssl/src/crypto/evp/c_allc.c index 804bd6950fc..a4c796b6d57 100644 --- a/lib/libssl/src/crypto/evp/c_allc.c +++ b/lib/libssl/src/crypto/evp/c_allc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_allc.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: c_allc.c,v 1.12 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/pkcs12.h> diff --git a/lib/libssl/src/crypto/evp/c_alld.c b/lib/libssl/src/crypto/evp/c_alld.c index 9b589ae7ecf..16726b6caa6 100644 --- a/lib/libssl/src/crypto/evp/c_alld.c +++ b/lib/libssl/src/crypto/evp/c_alld.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c_alld.c,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: c_alld.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/pkcs12.h> diff --git a/lib/libssl/src/crypto/evp/digest.c b/lib/libssl/src/crypto/evp/digest.c index 5d5799a49fc..e1ce7dd3a34 100644 --- a/lib/libssl/src/crypto/evp/digest.c +++ b/lib/libssl/src/crypto/evp/digest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: digest.c,v 1.19 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: digest.c,v 1.20 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -112,6 +112,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/objects.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/e_aes.c b/lib/libssl/src/crypto/evp/e_aes.c index f40bcf8bd38..fb767d96193 100644 --- a/lib/libssl/src/crypto/evp/e_aes.c +++ b/lib/libssl/src/crypto/evp/e_aes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_aes.c,v 1.22 2014/06/15 22:53:21 tedu Exp $ */ +/* $OpenBSD: e_aes.c,v 1.23 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. * @@ -49,16 +49,19 @@ * */ +#include <assert.h> +#include <string.h> + #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_AES -#include <openssl/evp.h> -#include <openssl/err.h> -#include <string.h> -#include <assert.h> #include <openssl/aes.h> +#include <openssl/err.h> +#include <openssl/evp.h> +#include <openssl/rand.h> + #include "evp_locl.h" #include "modes_lcl.h" -#include <openssl/rand.h> typedef struct { AES_KEY ks; diff --git a/lib/libssl/src/crypto/evp/e_aes_cbc_hmac_sha1.c b/lib/libssl/src/crypto/evp/e_aes_cbc_hmac_sha1.c index c38ab112803..a9a5cf1ca5a 100644 --- a/lib/libssl/src/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/lib/libssl/src/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2011-2013 The OpenSSL Project. All rights reserved. * @@ -48,11 +48,11 @@ * ==================================================================== */ -#include <openssl/opensslconf.h> - #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #if !defined(OPENSSL_NO_AES) && !defined(OPENSSL_NO_SHA1) #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/e_bf.c b/lib/libssl/src/crypto/evp/e_bf.c index 06c734783e6..fe133fb8ea5 100644 --- a/lib/libssl/src/crypto/evp/e_bf.c +++ b/lib/libssl/src/crypto/evp/e_bf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_bf.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_bf.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_BF #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/e_camellia.c b/lib/libssl/src/crypto/evp/e_camellia.c index 871bada59ea..4868c98c5df 100644 --- a/lib/libssl/src/crypto/evp/e_camellia.c +++ b/lib/libssl/src/crypto/evp/e_camellia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_camellia.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_camellia.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2006 The OpenSSL Project. All rights reserved. * @@ -53,12 +53,14 @@ * */ +#include <assert.h> +#include <string.h> + #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_CAMELLIA #include <openssl/evp.h> #include <openssl/err.h> -#include <string.h> -#include <assert.h> #include <openssl/camellia.h> #include "evp_locl.h" diff --git a/lib/libssl/src/crypto/evp/e_cast.c b/lib/libssl/src/crypto/evp/e_cast.c index ee97f49c2e8..2476bf2799a 100644 --- a/lib/libssl/src/crypto/evp/e_cast.c +++ b/lib/libssl/src/crypto/evp/e_cast.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_cast.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_cast.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_CAST diff --git a/lib/libssl/src/crypto/evp/e_chacha.c b/lib/libssl/src/crypto/evp/e_chacha.c index d1a1c59ae6c..0a5ab98cdbe 100644 --- a/lib/libssl/src/crypto/evp/e_chacha.c +++ b/lib/libssl/src/crypto/evp/e_chacha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_chacha.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_chacha.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -15,6 +15,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_CHACHA #include <openssl/chacha.h> diff --git a/lib/libssl/src/crypto/evp/e_chacha20poly1305.c b/lib/libssl/src/crypto/evp/e_chacha20poly1305.c index 90d8a9c7b85..da1e0366686 100644 --- a/lib/libssl/src/crypto/evp/e_chacha20poly1305.c +++ b/lib/libssl/src/crypto/evp/e_chacha20poly1305.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_chacha20poly1305.c,v 1.7 2014/06/21 15:30:36 jsing Exp $ */ +/* $OpenBSD: e_chacha20poly1305.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -17,14 +17,16 @@ #include <stdint.h> #include <string.h> + #include <openssl/opensslconf.h> #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) +#include <openssl/err.h> +#include <openssl/evp.h> #include <openssl/chacha.h> #include <openssl/poly1305.h> -#include <openssl/evp.h> -#include <openssl/err.h> + #include "evp_locl.h" #define POLY1305_TAG_LEN 16 diff --git a/lib/libssl/src/crypto/evp/e_des.c b/lib/libssl/src/crypto/evp/e_des.c index 45a6e84cb51..1f0de7cbfd3 100644 --- a/lib/libssl/src/crypto/evp/e_des.c +++ b/lib/libssl/src/crypto/evp/e_des.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_des.c,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_des.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_DES #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/e_des3.c b/lib/libssl/src/crypto/evp/e_des3.c index 41fa09a2d98..f4264d8ca48 100644 --- a/lib/libssl/src/crypto/evp/e_des3.c +++ b/lib/libssl/src/crypto/evp/e_des3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_des3.c,v 1.14 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: e_des3.c,v 1.15 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_DES #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/e_idea.c b/lib/libssl/src/crypto/evp/e_idea.c index 8f4e06161bc..7dd385e04e2 100644 --- a/lib/libssl/src/crypto/evp/e_idea.c +++ b/lib/libssl/src/crypto/evp/e_idea.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_idea.c,v 1.7 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_idea.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_IDEA diff --git a/lib/libssl/src/crypto/evp/e_old.c b/lib/libssl/src/crypto/evp/e_old.c index bfd45d2c88f..235ebe242b4 100644 --- a/lib/libssl/src/crypto/evp/e_old.c +++ b/lib/libssl/src/crypto/evp/e_old.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_old.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_old.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2004. */ @@ -56,6 +56,8 @@ * */ +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_DEPRECATED #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/e_rc2.c b/lib/libssl/src/crypto/evp/e_rc2.c index ad8e2f6c630..c164ab10f76 100644 --- a/lib/libssl/src/crypto/evp/e_rc2.c +++ b/lib/libssl/src/crypto/evp/e_rc2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc2.c,v 1.8 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_rc2.c,v 1.9 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_RC2 diff --git a/lib/libssl/src/crypto/evp/e_rc4.c b/lib/libssl/src/crypto/evp/e_rc4.c index d272c03ee1e..f8e4149a626 100644 --- a/lib/libssl/src/crypto/evp/e_rc4.c +++ b/lib/libssl/src/crypto/evp/e_rc4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc4.c,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_rc4.c,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_RC4 diff --git a/lib/libssl/src/crypto/evp/e_rc4_hmac_md5.c b/lib/libssl/src/crypto/evp/e_rc4_hmac_md5.c index edbc4de5395..05c79ff09dc 100644 --- a/lib/libssl/src/crypto/evp/e_rc4_hmac_md5.c +++ b/lib/libssl/src/crypto/evp/e_rc4_hmac_md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc4_hmac_md5.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_rc4_hmac_md5.c,v 1.4 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2011 The OpenSSL Project. All rights reserved. * @@ -48,11 +48,11 @@ * ==================================================================== */ -#include <openssl/opensslconf.h> - #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_MD5) #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/e_rc5.c b/lib/libssl/src/crypto/evp/e_rc5.c index f2c976319b4..00e12518189 100644 --- a/lib/libssl/src/crypto/evp/e_rc5.c +++ b/lib/libssl/src/crypto/evp/e_rc5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_rc5.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: e_rc5.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_RC5 diff --git a/lib/libssl/src/crypto/evp/e_xcbc_d.c b/lib/libssl/src/crypto/evp/e_xcbc_d.c index 401fb2b7662..496850b315b 100644 --- a/lib/libssl/src/crypto/evp/e_xcbc_d.c +++ b/lib/libssl/src/crypto/evp/e_xcbc_d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_xcbc_d.c,v 1.10 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: e_xcbc_d.c,v 1.11 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_DES diff --git a/lib/libssl/src/crypto/evp/evp_enc.c b/lib/libssl/src/crypto/evp/evp_enc.c index 36e39a46688..798ac442f90 100644 --- a/lib/libssl/src/crypto/evp/evp_enc.c +++ b/lib/libssl/src/crypto/evp/evp_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_enc.c,v 1.22 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: evp_enc.c,v 1.23 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/err.h> diff --git a/lib/libssl/src/crypto/evp/evp_err.c b/lib/libssl/src/crypto/evp/evp_err.c index 6391a814226..2eddd79a3fa 100644 --- a/lib/libssl/src/crypto/evp/evp_err.c +++ b/lib/libssl/src/crypto/evp/evp_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_err.c,v 1.19 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: evp_err.c,v 1.20 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/evp/evp_pbe.c b/lib/libssl/src/crypto/evp/evp_pbe.c index e53a681d5f9..63e71c0bc99 100644 --- a/lib/libssl/src/crypto/evp/evp_pbe.c +++ b/lib/libssl/src/crypto/evp/evp_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pbe.c,v 1.18 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.19 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/pkcs12.h> diff --git a/lib/libssl/src/crypto/evp/m_dss.c b/lib/libssl/src/crypto/evp/m_dss.c index d49946d8030..81e3dd1511f 100644 --- a/lib/libssl/src/crypto/evp/m_dss.c +++ b/lib/libssl/src/crypto/evp/m_dss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_dss.c,v 1.14 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_dss.c,v 1.15 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/objects.h> diff --git a/lib/libssl/src/crypto/evp/m_dss1.c b/lib/libssl/src/crypto/evp/m_dss1.c index e7261aeb66b..efa91230dcf 100644 --- a/lib/libssl/src/crypto/evp/m_dss1.c +++ b/lib/libssl/src/crypto/evp/m_dss1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_dss1.c,v 1.14 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_dss1.c,v 1.15 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_SHA diff --git a/lib/libssl/src/crypto/evp/m_ecdsa.c b/lib/libssl/src/crypto/evp/m_ecdsa.c index 20a605292d9..d4872dcf298 100644 --- a/lib/libssl/src/crypto/evp/m_ecdsa.c +++ b/lib/libssl/src/crypto/evp/m_ecdsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_ecdsa.c,v 1.6 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_ecdsa.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -110,6 +110,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/evp.h> #include <openssl/objects.h> diff --git a/lib/libssl/src/crypto/evp/m_md4.c b/lib/libssl/src/crypto/evp/m_md4.c index 8535db9418d..e24d0ad66fc 100644 --- a/lib/libssl/src/crypto/evp/m_md4.c +++ b/lib/libssl/src/crypto/evp/m_md4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_md4.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_md4.c,v 1.12 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_MD4 diff --git a/lib/libssl/src/crypto/evp/m_md5.c b/lib/libssl/src/crypto/evp/m_md5.c index 93b8672e5a1..445b2b43812 100644 --- a/lib/libssl/src/crypto/evp/m_md5.c +++ b/lib/libssl/src/crypto/evp/m_md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_md5.c,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_md5.c,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_MD5 diff --git a/lib/libssl/src/crypto/evp/m_mdc2.c b/lib/libssl/src/crypto/evp/m_mdc2.c index a59cc5da661..c360c986d54 100644 --- a/lib/libssl/src/crypto/evp/m_mdc2.c +++ b/lib/libssl/src/crypto/evp/m_mdc2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_mdc2.c,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_mdc2.c,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_MDC2 diff --git a/lib/libssl/src/crypto/evp/m_ripemd.c b/lib/libssl/src/crypto/evp/m_ripemd.c index 60498bfe8a7..c496a205d6a 100644 --- a/lib/libssl/src/crypto/evp/m_ripemd.c +++ b/lib/libssl/src/crypto/evp/m_ripemd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_ripemd.c,v 1.9 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_ripemd.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_RIPEMD diff --git a/lib/libssl/src/crypto/evp/m_sha.c b/lib/libssl/src/crypto/evp/m_sha.c index 3865e8441fa..ed22c1aec56 100644 --- a/lib/libssl/src/crypto/evp/m_sha.c +++ b/lib/libssl/src/crypto/evp/m_sha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_sha.c,v 1.13 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_sha.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0) diff --git a/lib/libssl/src/crypto/evp/m_sha1.c b/lib/libssl/src/crypto/evp/m_sha1.c index 9c0a81b4ed9..0441f632d33 100644 --- a/lib/libssl/src/crypto/evp/m_sha1.c +++ b/lib/libssl/src/crypto/evp/m_sha1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: m_sha1.c,v 1.15 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_sha1.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_SHA diff --git a/lib/libssl/src/crypto/evp/m_wp.c b/lib/libssl/src/crypto/evp/m_wp.c index 0ddb7b9f957..c6b246a3c51 100644 --- a/lib/libssl/src/crypto/evp/m_wp.c +++ b/lib/libssl/src/crypto/evp/m_wp.c @@ -1,6 +1,9 @@ -/* $OpenBSD: m_wp.c,v 1.5 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: m_wp.c,v 1.6 2014/07/10 22:45:57 jsing Exp $ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_WHIRLPOOL diff --git a/lib/libssl/src/crypto/evp/p5_crpt2.c b/lib/libssl/src/crypto/evp/p5_crpt2.c index 3a182aabfd0..c0723769126 100644 --- a/lib/libssl/src/crypto/evp/p5_crpt2.c +++ b/lib/libssl/src/crypto/evp/p5_crpt2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_crpt2.c,v 1.15 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: p5_crpt2.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -60,6 +60,8 @@ #include <stdlib.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #if !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA) #include <openssl/x509.h> diff --git a/lib/libssl/src/crypto/evp/p_dec.c b/lib/libssl/src/crypto/evp/p_dec.c index 5ed23922703..c47408dff00 100644 --- a/lib/libssl/src/crypto/evp/p_dec.c +++ b/lib/libssl/src/crypto/evp/p_dec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_dec.c,v 1.7 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: p_dec.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/rand.h> #ifndef OPENSSL_NO_RSA diff --git a/lib/libssl/src/crypto/evp/p_enc.c b/lib/libssl/src/crypto/evp/p_enc.c index f6b2e52521d..a1fb9d1d2c2 100644 --- a/lib/libssl/src/crypto/evp/p_enc.c +++ b/lib/libssl/src/crypto/evp/p_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_enc.c,v 1.7 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: p_enc.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/rand.h> #ifndef OPENSSL_NO_RSA diff --git a/lib/libssl/src/crypto/evp/p_lib.c b/lib/libssl/src/crypto/evp/p_lib.c index 8abaae3bcd7..6db5e95cd07 100644 --- a/lib/libssl/src/crypto/evp/p_lib.c +++ b/lib/libssl/src/crypto/evp/p_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_lib.c,v 1.13 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: p_lib.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/err.h> diff --git a/lib/libssl/src/crypto/evp/p_open.c b/lib/libssl/src/crypto/evp/p_open.c index 2f8a3832f7c..aec4d9f3d06 100644 --- a/lib/libssl/src/crypto/evp/p_open.c +++ b/lib/libssl/src/crypto/evp/p_open.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_open.c,v 1.14 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: p_open.c,v 1.15 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #ifndef OPENSSL_NO_RSA diff --git a/lib/libssl/src/crypto/evp/p_seal.c b/lib/libssl/src/crypto/evp/p_seal.c index d590cd7e37b..4acb9f80549 100644 --- a/lib/libssl/src/crypto/evp/p_seal.c +++ b/lib/libssl/src/crypto/evp/p_seal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p_seal.c,v 1.11 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: p_seal.c,v 1.12 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/rand.h> #ifndef OPENSSL_NO_RSA diff --git a/lib/libssl/src/crypto/evp/pmeth_lib.c b/lib/libssl/src/crypto/evp/pmeth_lib.c index 6f8515c670a..f23524b8a94 100644 --- a/lib/libssl/src/crypto/evp/pmeth_lib.c +++ b/lib/libssl/src/crypto/evp/pmeth_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmeth_lib.c,v 1.6 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: pmeth_lib.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -60,6 +60,8 @@ #include <stdlib.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/objects.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/lhash/lh_stats.c b/lib/libssl/src/crypto/lhash/lh_stats.c index 1c7de619780..b4202efb2e5 100644 --- a/lib/libssl/src/crypto/lhash/lh_stats.c +++ b/lib/libssl/src/crypto/lhash/lh_stats.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lh_stats.c,v 1.10 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: lh_stats.c,v 1.11 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,9 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> + +#include <openssl/opensslconf.h> + /* If you wish to build this outside of SSLeay, remove the following lines * and things should work as expected */ #include "cryptlib.h" diff --git a/lib/libssl/src/crypto/lhash/lhash.c b/lib/libssl/src/crypto/lhash/lhash.c index bfac94a0f72..f4994f7471d 100644 --- a/lib/libssl/src/crypto/lhash/lhash.c +++ b/lib/libssl/src/crypto/lhash/lhash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lhash.c,v 1.16 2014/07/09 11:10:51 bcook Exp $ */ +/* $OpenBSD: lhash.c,v 1.17 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -97,6 +97,9 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include <openssl/lhash.h> diff --git a/lib/libssl/src/crypto/md32_common.h b/lib/libssl/src/crypto/md32_common.h index 0a78a5e86ad..af753099f54 100644 --- a/lib/libssl/src/crypto/md32_common.h +++ b/lib/libssl/src/crypto/md32_common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md32_common.h,v 1.15 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: md32_common.h,v 1.16 2014/07/10 22:45:56 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -109,6 +109,8 @@ * <appro@fy.chalmers.se> */ +#include <openssl/opensslconf.h> + #if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN) #error "DATA_ORDER must be defined!" #endif diff --git a/lib/libssl/src/crypto/md4/md4.h b/lib/libssl/src/crypto/md4/md4.h index bbdac701f60..39ee8f58413 100644 --- a/lib/libssl/src/crypto/md4/md4.h +++ b/lib/libssl/src/crypto/md4/md4.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md4.h,v 1.12 2014/07/10 09:01:04 miod Exp $ */ +/* $OpenBSD: md4.h,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,11 @@ * [including the GNU Public Licence.] */ +#include <stddef.h> + #ifndef HEADER_MD4_H #define HEADER_MD4_H -#include <stddef.h> - #include <openssl/opensslconf.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/md5/md5.h b/lib/libssl/src/crypto/md5/md5.h index 3f27da8d695..98bdbc7b258 100644 --- a/lib/libssl/src/crypto/md5/md5.h +++ b/lib/libssl/src/crypto/md5/md5.h @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.h,v 1.16 2014/07/10 09:01:04 miod Exp $ */ +/* $OpenBSD: md5.h,v 1.17 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,11 @@ * [including the GNU Public Licence.] */ +#include <stddef.h> + #ifndef HEADER_MD5_H #define HEADER_MD5_H -#include <stddef.h> - #include <openssl/opensslconf.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/mdc2/mdc2.h b/lib/libssl/src/crypto/mdc2/mdc2.h index 8ac68a15a9e..9128eeb8781 100644 --- a/lib/libssl/src/crypto/mdc2/mdc2.h +++ b/lib/libssl/src/crypto/mdc2/mdc2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mdc2.h,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */ +/* $OpenBSD: mdc2.h,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #ifndef HEADER_MDC2_H #define HEADER_MDC2_H +#include <openssl/opensslconf.h> + #include <openssl/des.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/modes/modes_lcl.h b/lib/libssl/src/crypto/modes/modes_lcl.h index eacb253e26a..8e43e480fc1 100644 --- a/lib/libssl/src/crypto/modes/modes_lcl.h +++ b/lib/libssl/src/crypto/modes/modes_lcl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: modes_lcl.h,v 1.7 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: modes_lcl.h,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2010 The OpenSSL Project. All rights reserved. * @@ -6,9 +6,11 @@ * ==================================================================== */ -#include <openssl/modes.h> #include <machine/endian.h> +#include <openssl/opensslconf.h> + +#include <openssl/modes.h> #if defined(_LP64) typedef long i64; diff --git a/lib/libssl/src/crypto/objects/obj_dat.c b/lib/libssl/src/crypto/objects/obj_dat.c index 7221cbc847f..4d0307a3152 100644 --- a/lib/libssl/src/crypto/objects/obj_dat.c +++ b/lib/libssl/src/crypto/objects/obj_dat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obj_dat.c,v 1.28 2014/07/10 13:58:22 jsing Exp $ */ +/* $OpenBSD: obj_dat.c,v 1.29 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -61,6 +61,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/lhash.h> #include <openssl/asn1.h> diff --git a/lib/libssl/src/crypto/objects/obj_err.c b/lib/libssl/src/crypto/objects/obj_err.c index 4d074764082..9cea59b7854 100644 --- a/lib/libssl/src/crypto/objects/obj_err.c +++ b/lib/libssl/src/crypto/objects/obj_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obj_err.c,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: obj_err.c,v 1.11 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/objects.h> diff --git a/lib/libssl/src/crypto/ocsp/ocsp_err.c b/lib/libssl/src/crypto/ocsp/ocsp_err.c index c4efc1c4e9f..af781074b62 100644 --- a/lib/libssl/src/crypto/ocsp/ocsp_err.c +++ b/lib/libssl/src/crypto/ocsp/ocsp_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_err.c,v 1.6 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: ocsp_err.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/ocsp.h> diff --git a/lib/libssl/src/crypto/ocsp/ocsp_lib.c b/lib/libssl/src/crypto/ocsp/ocsp_lib.c index ce6b0dc65b3..eda627f4ed7 100644 --- a/lib/libssl/src/crypto/ocsp/ocsp_lib.c +++ b/lib/libssl/src/crypto/ocsp/ocsp_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp_lib.c,v 1.12 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: ocsp_lib.c,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL * project. */ @@ -65,6 +65,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include <openssl/objects.h> #include <openssl/rand.h> #include <openssl/x509.h> diff --git a/lib/libssl/src/crypto/pem/pem_all.c b/lib/libssl/src/crypto/pem/pem_all.c index a43c81f2c27..e883acdc655 100644 --- a/lib/libssl/src/crypto/pem/pem_all.c +++ b/lib/libssl/src/crypto/pem/pem_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_all.c,v 1.13 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: pem_all.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,6 +110,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bio.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/pem/pem_err.c b/lib/libssl/src/crypto/pem/pem_err.c index b7453f3f66e..c3d0fa35768 100644 --- a/lib/libssl/src/crypto/pem/pem_err.c +++ b/lib/libssl/src/crypto/pem/pem_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_err.c,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: pem_err.c,v 1.11 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/pem.h> diff --git a/lib/libssl/src/crypto/pem/pem_info.c b/lib/libssl/src/crypto/pem/pem_info.c index 0c8946550e2..eaf70e4267d 100644 --- a/lib/libssl/src/crypto/pem/pem_info.c +++ b/lib/libssl/src/crypto/pem/pem_info.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_info.c,v 1.17 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: pem_info.c,v 1.18 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/objects.h> diff --git a/lib/libssl/src/crypto/pem/pem_lib.c b/lib/libssl/src/crypto/pem/pem_lib.c index 130a2739a53..70e2aa633dd 100644 --- a/lib/libssl/src/crypto/pem/pem_lib.c +++ b/lib/libssl/src/crypto/pem/pem_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_lib.c,v 1.31 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: pem_lib.c,v 1.32 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,6 +60,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/objects.h> diff --git a/lib/libssl/src/crypto/pem/pem_pkey.c b/lib/libssl/src/crypto/pem/pem_pkey.c index cfa3c127523..68d6590f14b 100644 --- a/lib/libssl/src/crypto/pem/pem_pkey.c +++ b/lib/libssl/src/crypto/pem/pem_pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_pkey.c,v 1.15 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: pem_pkey.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/objects.h> diff --git a/lib/libssl/src/crypto/pem/pem_seal.c b/lib/libssl/src/crypto/pem/pem_seal.c index 45ea52b24b7..08680e45db0 100644 --- a/lib/libssl/src/crypto/pem/pem_seal.c +++ b/lib/libssl/src/crypto/pem/pem_seal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pem_seal.c,v 1.18 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: pem_seal.c,v 1.19 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,6 +60,7 @@ #include <string.h> #include <openssl/opensslconf.h> /* for OPENSSL_NO_RSA */ + #ifndef OPENSSL_NO_RSA #include "cryptlib.h" #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/pem/pvkfmt.c b/lib/libssl/src/crypto/pem/pvkfmt.c index 53c96e088c3..8a945b4dd77 100644 --- a/lib/libssl/src/crypto/pem/pvkfmt.c +++ b/lib/libssl/src/crypto/pem/pvkfmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pvkfmt.c,v 1.7 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: pvkfmt.c,v 1.8 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2005. */ @@ -62,6 +62,8 @@ #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/pem.h> #include <openssl/rand.h> diff --git a/lib/libssl/src/crypto/pkcs12/p12_mutl.c b/lib/libssl/src/crypto/pkcs12/p12_mutl.c index fabc96e8584..582d1de23be 100644 --- a/lib/libssl/src/crypto/pkcs12/p12_mutl.c +++ b/lib/libssl/src/crypto/pkcs12/p12_mutl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_mutl.c,v 1.15 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: p12_mutl.c,v 1.16 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_HMAC #include "cryptlib.h" #include <openssl/hmac.h> diff --git a/lib/libssl/src/crypto/pkcs12/pk12err.c b/lib/libssl/src/crypto/pkcs12/pk12err.c index 12f418eb235..0464a8303c1 100644 --- a/lib/libssl/src/crypto/pkcs12/pk12err.c +++ b/lib/libssl/src/crypto/pkcs12/pk12err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pk12err.c,v 1.9 2014/07/08 09:24:53 jsing Exp $ */ +/* $OpenBSD: pk12err.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/pkcs12.h> diff --git a/lib/libssl/src/crypto/pkcs7/pkcs7err.c b/lib/libssl/src/crypto/pkcs7/pkcs7err.c index a194e2dadc5..8a67bf52210 100644 --- a/lib/libssl/src/crypto/pkcs7/pkcs7err.c +++ b/lib/libssl/src/crypto/pkcs7/pkcs7err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs7err.c,v 1.10 2014/06/29 17:05:36 jsing Exp $ */ +/* $OpenBSD: pkcs7err.c,v 1.11 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/pkcs7.h> diff --git a/lib/libssl/src/crypto/rand/rand.h b/lib/libssl/src/crypto/rand/rand.h index af3d111b132..6ed16b9c412 100644 --- a/lib/libssl/src/crypto/rand/rand.h +++ b/lib/libssl/src/crypto/rand/rand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rand.h,v 1.20 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rand.h,v 1.21 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,11 @@ * [including the GNU Public Licence.] */ +#include <stdlib.h> + #ifndef HEADER_RAND_H #define HEADER_RAND_H -#include <stdlib.h> - #include <openssl/opensslconf.h> #include <openssl/ossl_typ.h> diff --git a/lib/libssl/src/crypto/rand/rand_err.c b/lib/libssl/src/crypto/rand/rand_err.c index 35b1d43666f..3f91fcb37bf 100644 --- a/lib/libssl/src/crypto/rand/rand_err.c +++ b/lib/libssl/src/crypto/rand/rand_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rand_err.c,v 1.13 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rand_err.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/rand.h> diff --git a/lib/libssl/src/crypto/rand/rand_lib.c b/lib/libssl/src/crypto/rand/rand_lib.c index 200a868d709..38c15699404 100644 --- a/lib/libssl/src/crypto/rand/rand_lib.c +++ b/lib/libssl/src/crypto/rand/rand_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rand_lib.c,v 1.17 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rand_lib.c,v 1.18 2014/07/10 22:45:57 jsing Exp $ */ /* * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> * @@ -14,6 +14,9 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/rand.h> diff --git a/lib/libssl/src/crypto/rc2/rc2.h b/lib/libssl/src/crypto/rc2/rc2.h index eeec3c0c9b0..21511ff36ea 100644 --- a/lib/libssl/src/crypto/rc2/rc2.h +++ b/lib/libssl/src/crypto/rc2/rc2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rc2.h,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rc2.h,v 1.11 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,6 +60,7 @@ #define HEADER_RC2_H #include <openssl/opensslconf.h> /* OPENSSL_NO_RC2, RC2_INT */ + #ifdef OPENSSL_NO_RC2 #error RC2 is disabled. #endif diff --git a/lib/libssl/src/crypto/rc4/rc4.h b/lib/libssl/src/crypto/rc4/rc4.h index 0712fc0a95c..5359577402d 100644 --- a/lib/libssl/src/crypto/rc4/rc4.h +++ b/lib/libssl/src/crypto/rc4/rc4.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rc4.h,v 1.11 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rc4.h,v 1.12 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,6 +60,7 @@ #define HEADER_RC4_H #include <openssl/opensslconf.h> /* OPENSSL_NO_RC4, RC4_INT */ + #ifdef OPENSSL_NO_RC4 #error RC4 is disabled. #endif diff --git a/lib/libssl/src/crypto/rc5/rc5_locl.h b/lib/libssl/src/crypto/rc5/rc5_locl.h index 07e1503981e..07671decaab 100644 --- a/lib/libssl/src/crypto/rc5/rc5_locl.h +++ b/lib/libssl/src/crypto/rc5/rc5_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rc5_locl.h,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: rc5_locl.h,v 1.5 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,6 +58,8 @@ #include <stdlib.h> +#include <openssl/opensslconf.h> + #undef c2l #define c2l(c,l) (l =((unsigned long)(*((c)++))) , \ l|=((unsigned long)(*((c)++)))<< 8L, \ diff --git a/lib/libssl/src/crypto/ripemd/ripemd.h b/lib/libssl/src/crypto/ripemd/ripemd.h index 820d0a2a698..a5f3a129373 100644 --- a/lib/libssl/src/crypto/ripemd/ripemd.h +++ b/lib/libssl/src/crypto/ripemd/ripemd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ripemd.h,v 1.13 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: ripemd.h,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,11 @@ * [including the GNU Public Licence.] */ +#include <stddef.h> + #ifndef HEADER_RIPEMD_H #define HEADER_RIPEMD_H -#include <stddef.h> - #include <openssl/opensslconf.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/rsa/rsa.h b/lib/libssl/src/crypto/rsa/rsa.h index b84ab4c6d75..d15d1f1c97d 100644 --- a/lib/libssl/src/crypto/rsa/rsa.h +++ b/lib/libssl/src/crypto/rsa/rsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa.h,v 1.24 2014/07/10 12:08:22 jsing Exp $ */ +/* $OpenBSD: rsa.h,v 1.25 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -59,6 +59,8 @@ #ifndef HEADER_RSA_H #define HEADER_RSA_H +#include <openssl/opensslconf.h> + #include <openssl/asn1.h> #ifndef OPENSSL_NO_BIO diff --git a/lib/libssl/src/crypto/rsa/rsa_ameth.c b/lib/libssl/src/crypto/rsa/rsa_ameth.c index 679fe7b3188..1eeb58ed9bb 100644 --- a/lib/libssl/src/crypto/rsa/rsa_ameth.c +++ b/lib/libssl/src/crypto/rsa/rsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_ameth.c,v 1.9 2014/07/09 22:55:17 tedu Exp $ */ +/* $OpenBSD: rsa_ameth.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/asn1t.h> #include <openssl/x509.h> diff --git a/lib/libssl/src/crypto/rsa/rsa_crpt.c b/lib/libssl/src/crypto/rsa/rsa_crpt.c index 5de69a6fb5e..220ce9497ab 100644 --- a/lib/libssl/src/crypto/rsa/rsa_crpt.c +++ b/lib/libssl/src/crypto/rsa/rsa_crpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_crpt.c,v 1.9 2014/07/10 12:36:58 miod Exp $ */ +/* $OpenBSD: rsa_crpt.c,v 1.10 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/lhash.h> diff --git a/lib/libssl/src/crypto/rsa/rsa_depr.c b/lib/libssl/src/crypto/rsa/rsa_depr.c index f66c832b2ac..547f9a491e3 100644 --- a/lib/libssl/src/crypto/rsa/rsa_depr.c +++ b/lib/libssl/src/crypto/rsa/rsa_depr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_depr.c,v 1.6 2014/07/10 07:43:11 jsing Exp $ */ +/* $OpenBSD: rsa_depr.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. * @@ -58,6 +58,9 @@ #include <stdio.h> #include <time.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/rsa.h> diff --git a/lib/libssl/src/crypto/rsa/rsa_eay.c b/lib/libssl/src/crypto/rsa/rsa_eay.c index 9b390fb8c0e..3cc8f6c5cfa 100644 --- a/lib/libssl/src/crypto/rsa/rsa_eay.c +++ b/lib/libssl/src/crypto/rsa/rsa_eay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_eay.c,v 1.32 2014/07/10 07:43:11 jsing Exp $ */ +/* $OpenBSD: rsa_eay.c,v 1.33 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -110,6 +110,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/rsa.h> diff --git a/lib/libssl/src/crypto/rsa/rsa_err.c b/lib/libssl/src/crypto/rsa/rsa_err.c index 893069a8921..4c4a3551c5b 100644 --- a/lib/libssl/src/crypto/rsa/rsa_err.c +++ b/lib/libssl/src/crypto/rsa/rsa_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_err.c,v 1.14 2014/07/09 19:51:38 jsing Exp $ */ +/* $OpenBSD: rsa_err.c,v 1.15 2014/07/10 22:45:57 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/rsa.h> diff --git a/lib/libssl/src/crypto/rsa/rsa_lib.c b/lib/libssl/src/crypto/rsa/rsa_lib.c index 6f378ba0c07..d7a51c7b05c 100644 --- a/lib/libssl/src/crypto/rsa/rsa_lib.c +++ b/lib/libssl/src/crypto/rsa/rsa_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_lib.c,v 1.26 2014/07/10 07:43:11 jsing Exp $ */ +/* $OpenBSD: rsa_lib.c,v 1.27 2014/07/10 22:45:57 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/lhash.h> diff --git a/lib/libssl/src/crypto/rsa/rsa_oaep.c b/lib/libssl/src/crypto/rsa/rsa_oaep.c index 893fbc04b89..09799818d36 100644 --- a/lib/libssl/src/crypto/rsa/rsa_oaep.c +++ b/lib/libssl/src/crypto/rsa/rsa_oaep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_oaep.c,v 1.21 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: rsa_oaep.c,v 1.22 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Ulf Moeller. This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */ @@ -21,6 +21,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) #include "cryptlib.h" #include <openssl/bn.h> diff --git a/lib/libssl/src/crypto/rsa/rsa_pmeth.c b/lib/libssl/src/crypto/rsa/rsa_pmeth.c index f9ebd9babac..0b2d680eedd 100644 --- a/lib/libssl/src/crypto/rsa/rsa_pmeth.c +++ b/lib/libssl/src/crypto/rsa/rsa_pmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_pmeth.c,v 1.12 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: rsa_pmeth.c,v 1.13 2014/07/10 22:45:57 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -60,6 +60,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/asn1t.h> #include <openssl/x509.h> diff --git a/lib/libssl/src/crypto/sha/sha.h b/lib/libssl/src/crypto/sha/sha.h index 5baa80e62f2..c2e303fcc25 100644 --- a/lib/libssl/src/crypto/sha/sha.h +++ b/lib/libssl/src/crypto/sha/sha.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sha.h,v 1.16 2014/07/10 09:01:04 miod Exp $ */ +/* $OpenBSD: sha.h,v 1.17 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,11 +56,11 @@ * [including the GNU Public Licence.] */ +#include <stddef.h> + #ifndef HEADER_SHA_H #define HEADER_SHA_H -#include <stddef.h> - #include <openssl/opensslconf.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/sha/sha1_one.c b/lib/libssl/src/crypto/sha/sha1_one.c index b6178c39af9..f6b5e4bacf8 100644 --- a/lib/libssl/src/crypto/sha/sha1_one.c +++ b/lib/libssl/src/crypto/sha/sha1_one.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1_one.c,v 1.10 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: sha1_one.c,v 1.11 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,6 +58,9 @@ #include <stdio.h> #include <string.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include <openssl/sha.h> diff --git a/lib/libssl/src/crypto/sha/sha1dgst.c b/lib/libssl/src/crypto/sha/sha1dgst.c index 94fabddd835..aac27bdd2d3 100644 --- a/lib/libssl/src/crypto/sha/sha1dgst.c +++ b/lib/libssl/src/crypto/sha/sha1dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1dgst.c,v 1.12 2014/07/09 11:10:51 bcook Exp $ */ +/* $OpenBSD: sha1dgst.c,v 1.13 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,8 +56,10 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include <openssl/opensslconf.h> + +#include <openssl/crypto.h> + #if !defined(OPENSSL_NO_SHA1) && !defined(OPENSSL_NO_SHA) #undef SHA_0 diff --git a/lib/libssl/src/crypto/sha/sha256.c b/lib/libssl/src/crypto/sha/sha256.c index 6d7af561fcf..a4c259dab76 100644 --- a/lib/libssl/src/crypto/sha/sha256.c +++ b/lib/libssl/src/crypto/sha/sha256.c @@ -1,15 +1,18 @@ -/* $OpenBSD: sha256.c,v 1.6 2014/07/09 16:06:13 miod Exp $ */ +/* $OpenBSD: sha256.c,v 1.7 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 <openssl/opensslconf.h> + #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256) +#include <machine/endian.h> + #include <stdlib.h> #include <string.h> -#include <machine/endian.h> #include <openssl/crypto.h> #include <openssl/sha.h> diff --git a/lib/libssl/src/crypto/sha/sha512.c b/lib/libssl/src/crypto/sha/sha512.c index 01ec6a6cde8..eb10024e326 100644 --- a/lib/libssl/src/crypto/sha/sha512.c +++ b/lib/libssl/src/crypto/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> diff --git a/lib/libssl/src/crypto/sha/sha_dgst.c b/lib/libssl/src/crypto/sha/sha_dgst.c index a2554509772..bb8c0c244ff 100644 --- a/lib/libssl/src/crypto/sha/sha_dgst.c +++ b/lib/libssl/src/crypto/sha/sha_dgst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha_dgst.c,v 1.11 2014/07/09 11:10:51 bcook Exp $ */ +/* $OpenBSD: sha_dgst.c,v 1.12 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,8 +56,10 @@ * [including the GNU Public Licence.] */ -#include <openssl/crypto.h> #include <openssl/opensslconf.h> + +#include <openssl/crypto.h> + #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA) #undef SHA_1 @@ -70,4 +72,3 @@ #include "sha_locl.h" #endif - diff --git a/lib/libssl/src/crypto/sha/sha_one.c b/lib/libssl/src/crypto/sha/sha_one.c index 557d3cab6aa..1d3fc35f05d 100644 --- a/lib/libssl/src/crypto/sha/sha_one.c +++ b/lib/libssl/src/crypto/sha/sha_one.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha_one.c,v 1.7 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: sha_one.c,v 1.8 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,8 +58,11 @@ #include <stdio.h> #include <string.h> -#include <openssl/sha.h> + +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> +#include <openssl/sha.h> #ifndef OPENSSL_NO_SHA0 unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md) diff --git a/lib/libssl/src/crypto/srp/srp.h b/lib/libssl/src/crypto/srp/srp.h index 53e7b8049a3..168d9656b3f 100644 --- a/lib/libssl/src/crypto/srp/srp.h +++ b/lib/libssl/src/crypto/srp/srp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: srp.h,v 1.2 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: srp.h,v 1.3 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Christophe Renou (christophe.renou@edelweb.fr) with * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) * for the EdelKey project and contributed to the OpenSSL project 2004. @@ -59,6 +59,8 @@ #ifndef __SRP_H__ #define __SRP_H__ +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_SRP #include <stdio.h> diff --git a/lib/libssl/src/crypto/srp/srp_lib.c b/lib/libssl/src/crypto/srp/srp_lib.c index 19056d40083..078296fa0a6 100644 --- a/lib/libssl/src/crypto/srp/srp_lib.c +++ b/lib/libssl/src/crypto/srp/srp_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: srp_lib.c,v 1.7 2014/07/10 20:22:00 miod Exp $ */ +/* $OpenBSD: srp_lib.c,v 1.8 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Christophe Renou (christophe.renou@edelweb.fr) with * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) * for the EdelKey project and contributed to the OpenSSL project 2004. @@ -56,6 +56,9 @@ * Hudson (tjh@cryptsoft.com). * */ + +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_SRP #include "cryptlib.h" #include "srp_lcl.h" diff --git a/lib/libssl/src/crypto/srp/srp_vfy.c b/lib/libssl/src/crypto/srp/srp_vfy.c index fb6e0ab8067..756744609a4 100644 --- a/lib/libssl/src/crypto/srp/srp_vfy.c +++ b/lib/libssl/src/crypto/srp/srp_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: srp_vfy.c,v 1.5 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: srp_vfy.c,v 1.6 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Christophe Renou (christophe.renou@edelweb.fr) with * the precious help of Peter Sylvester (peter.sylvester@edelweb.fr) * for the EdelKey project and contributed to the OpenSSL project 2004. @@ -56,6 +56,9 @@ * Hudson (tjh@cryptsoft.com). * */ + +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_SRP #include "cryptlib.h" #include "srp_lcl.h" diff --git a/lib/libssl/src/crypto/store/str_err.c b/lib/libssl/src/crypto/store/str_err.c index a3f7f2aa469..ff353920ab0 100644 --- a/lib/libssl/src/crypto/store/str_err.c +++ b/lib/libssl/src/crypto/store/str_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str_err.c,v 1.3 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: str_err.c,v 1.4 2014/07/10 22:45:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/store.h> diff --git a/lib/libssl/src/crypto/store/str_lib.c b/lib/libssl/src/crypto/store/str_lib.c index 2e76b6e728e..ff00aa19ce0 100644 --- a/lib/libssl/src/crypto/store/str_lib.c +++ b/lib/libssl/src/crypto/store/str_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str_lib.c,v 1.9 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: str_lib.c,v 1.10 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2003. */ @@ -57,6 +57,9 @@ */ #include <string.h> + +#include <openssl/opensslconf.h> + #include <openssl/bn.h> #include <openssl/err.h> #ifndef OPENSSL_NO_ENGINE diff --git a/lib/libssl/src/crypto/ts/ts.h b/lib/libssl/src/crypto/ts/ts.h index a6010fe86a8..4457d30dd7e 100644 --- a/lib/libssl/src/crypto/ts/ts.h +++ b/lib/libssl/src/crypto/ts/ts.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ts.h,v 1.6 2014/06/12 15:49:30 deraadt Exp $ */ +/* $OpenBSD: ts.h,v 1.7 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL * project 2002, 2003, 2004. */ @@ -60,6 +60,7 @@ #define HEADER_TS_H #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BUFFER #include <openssl/buffer.h> #endif diff --git a/lib/libssl/src/crypto/ts/ts_asn1.c b/lib/libssl/src/crypto/ts/ts_asn1.c index 8ee9f082210..bb87aa1d884 100644 --- a/lib/libssl/src/crypto/ts/ts_asn1.c +++ b/lib/libssl/src/crypto/ts/ts_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_asn1.c,v 1.4 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ts_asn1.c,v 1.5 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Nils Larsch for the OpenSSL project 2004. */ /* ==================================================================== @@ -55,6 +55,8 @@ * */ +#include <openssl/opensslconf.h> + #include <openssl/ts.h> #include <openssl/err.h> #include <openssl/asn1t.h> diff --git a/lib/libssl/src/crypto/ts/ts_conf.c b/lib/libssl/src/crypto/ts/ts_conf.c index b71caa8df04..685fdc07366 100644 --- a/lib/libssl/src/crypto/ts/ts_conf.c +++ b/lib/libssl/src/crypto/ts/ts_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_conf.c,v 1.5 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ts_conf.c,v 1.6 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL * project 2002. */ @@ -58,6 +58,8 @@ #include <string.h> +#include <openssl/opensslconf.h> + #include <openssl/crypto.h> #include "cryptlib.h" #include <openssl/pem.h> diff --git a/lib/libssl/src/crypto/ts/ts_err.c b/lib/libssl/src/crypto/ts/ts_err.c index 0fbfddea2fc..f71be883f8e 100644 --- a/lib/libssl/src/crypto/ts/ts_err.c +++ b/lib/libssl/src/crypto/ts/ts_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ts_err.c,v 1.3 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ts_err.c,v 1.4 2014/07/10 22:45:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/ts.h> diff --git a/lib/libssl/src/crypto/txt_db/txt_db.h b/lib/libssl/src/crypto/txt_db/txt_db.h index 4668cfb6249..56b6b42482d 100644 --- a/lib/libssl/src/crypto/txt_db/txt_db.h +++ b/lib/libssl/src/crypto/txt_db/txt_db.h @@ -1,4 +1,4 @@ -/* $OpenBSD: txt_db.h,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: txt_db.h,v 1.9 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,6 +60,7 @@ #define HEADER_TXT_DB_H #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif diff --git a/lib/libssl/src/crypto/ui/ui.h b/lib/libssl/src/crypto/ui/ui.h index 5abd5c2d7f0..b6b0075e4d6 100644 --- a/lib/libssl/src/crypto/ui/ui.h +++ b/lib/libssl/src/crypto/ui/ui.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ui.h,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ui.h,v 1.9 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2001. */ @@ -59,6 +59,8 @@ #ifndef HEADER_UI_H #define HEADER_UI_H +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_DEPRECATED #include <openssl/crypto.h> #endif diff --git a/lib/libssl/src/crypto/ui/ui_err.c b/lib/libssl/src/crypto/ui/ui_err.c index 3c204171f3c..576f334796e 100644 --- a/lib/libssl/src/crypto/ui/ui_err.c +++ b/lib/libssl/src/crypto/ui/ui_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ui_err.c,v 1.7 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ui_err.c,v 1.8 2014/07/10 22:45:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/ui.h> diff --git a/lib/libssl/src/crypto/whrlpool/whrlpool.h b/lib/libssl/src/crypto/whrlpool/whrlpool.h index e0ff0f872df..875d34f7d33 100644 --- a/lib/libssl/src/crypto/whrlpool/whrlpool.h +++ b/lib/libssl/src/crypto/whrlpool/whrlpool.h @@ -1,10 +1,10 @@ -/* $OpenBSD: whrlpool.h,v 1.4 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: whrlpool.h,v 1.5 2014/07/10 22:45:58 jsing Exp $ */ + +#include <stddef.h> #ifndef HEADER_WHRLPOOL_H #define HEADER_WHRLPOOL_H -#include <stddef.h> - #include <openssl/opensslconf.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/x509/by_dir.c b/lib/libssl/src/crypto/x509/by_dir.c index 2a5fb04373e..110c22d6f5a 100644 --- a/lib/libssl/src/crypto/x509/by_dir.c +++ b/lib/libssl/src/crypto/x509/by_dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_dir.c,v 1.30 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: by_dir.c,v 1.31 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,15 +56,18 @@ * [including the GNU Public Licence.] */ +#include <sys/types.h> + #include <errno.h> #include <stdio.h> #include <string.h> #include <time.h> #include <unistd.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" -#include <sys/types.h> #ifndef OPENSSL_NO_POSIX_IO # include <sys/stat.h> #endif @@ -72,7 +75,6 @@ #include <openssl/lhash.h> #include <openssl/x509.h> - typedef struct lookup_dir_hashes_st { unsigned long hash; int suffix; diff --git a/lib/libssl/src/crypto/x509/x509_cmp.c b/lib/libssl/src/crypto/x509/x509_cmp.c index aa85286d8b3..20b4ceba275 100644 --- a/lib/libssl/src/crypto/x509/x509_cmp.c +++ b/lib/libssl/src/crypto/x509/x509_cmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_cmp.c,v 1.20 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: x509_cmp.c,v 1.21 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,6 +60,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/asn1.h> #include <openssl/objects.h> diff --git a/lib/libssl/src/crypto/x509/x509_err.c b/lib/libssl/src/crypto/x509/x509_err.c index 93b8fa76981..6a15ac9fd09 100644 --- a/lib/libssl/src/crypto/x509/x509_err.c +++ b/lib/libssl/src/crypto/x509/x509_err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_err.c,v 1.11 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: x509_err.c,v 1.12 2014/07/10 22:45:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/x509.h> diff --git a/lib/libssl/src/crypto/x509/x509_req.c b/lib/libssl/src/crypto/x509/x509_req.c index b041a154e49..d22fc12a70c 100644 --- a/lib/libssl/src/crypto/x509/x509_req.c +++ b/lib/libssl/src/crypto/x509/x509_req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_req.c,v 1.13 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: x509_req.c,v 1.14 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/bn.h> #include <openssl/evp.h> diff --git a/lib/libssl/src/crypto/x509/x509_vfy.c b/lib/libssl/src/crypto/x509/x509_vfy.c index 5150ffa5d23..60067d220f0 100644 --- a/lib/libssl/src/crypto/x509/x509_vfy.c +++ b/lib/libssl/src/crypto/x509/x509_vfy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.c,v 1.31 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: x509_vfy.c,v 1.32 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -62,6 +62,8 @@ #include <time.h> #include <unistd.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/lhash.h> diff --git a/lib/libssl/src/crypto/x509/x509_vfy.h b/lib/libssl/src/crypto/x509/x509_vfy.h index dfc0f700dcf..5b411ca6787 100644 --- a/lib/libssl/src/crypto/x509/x509_vfy.h +++ b/lib/libssl/src/crypto/x509/x509_vfy.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.h,v 1.12 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: x509_vfy.h,v 1.13 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -66,6 +66,7 @@ #define HEADER_X509_VFY_H #include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_LHASH #include <openssl/lhash.h> #endif diff --git a/lib/libssl/src/crypto/x509/x_all.c b/lib/libssl/src/crypto/x509/x_all.c index 4461c7dda9d..f01e47416db 100644 --- a/lib/libssl/src/crypto/x509/x_all.c +++ b/lib/libssl/src/crypto/x509/x_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x_all.c,v 1.16 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: x_all.c,v 1.17 2014/07/10 22:45:58 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -57,6 +57,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/stack.h> #include "cryptlib.h" #include <openssl/buffer.h> diff --git a/lib/libssl/src/crypto/x509v3/ext_dat.h b/lib/libssl/src/crypto/x509v3/ext_dat.h index 36d535d42d4..1111af21081 100644 --- a/lib/libssl/src/crypto/x509v3/ext_dat.h +++ b/lib/libssl/src/crypto/x509v3/ext_dat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext_dat.h,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: ext_dat.h,v 1.11 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -55,6 +55,9 @@ * Hudson (tjh@cryptsoft.com). * */ + +#include <openssl/opensslconf.h> + /* This file contains a table of "standard" extensions */ extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; diff --git a/lib/libssl/src/crypto/x509v3/v3_addr.c b/lib/libssl/src/crypto/x509v3/v3_addr.c index 3fb43603c0e..9099994dc4d 100644 --- a/lib/libssl/src/crypto/x509v3/v3_addr.c +++ b/lib/libssl/src/crypto/x509v3/v3_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_addr.c,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: v3_addr.c,v 1.11 2014/07/10 22:45:58 jsing Exp $ */ /* * Contributed to the OpenSSL Project by the American Registry for * Internet Numbers ("ARIN"). @@ -63,6 +63,8 @@ #include <stdio.h> #include <stdlib.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/conf.h> #include <openssl/asn1.h> diff --git a/lib/libssl/src/crypto/x509v3/v3_asid.c b/lib/libssl/src/crypto/x509v3/v3_asid.c index b3245c9fe19..473304c1e5f 100644 --- a/lib/libssl/src/crypto/x509v3/v3_asid.c +++ b/lib/libssl/src/crypto/x509v3/v3_asid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_asid.c,v 1.8 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: v3_asid.c,v 1.9 2014/07/10 22:45:58 jsing Exp $ */ /* * Contributed to the OpenSSL Project by the American Registry for * Internet Numbers ("ARIN"). @@ -62,6 +62,9 @@ #include <stdio.h> #include <string.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/conf.h> #include <openssl/asn1.h> diff --git a/lib/libssl/src/crypto/x509v3/v3_ocsp.c b/lib/libssl/src/crypto/x509v3/v3_ocsp.c index ca3fc51c770..0406c83be3d 100644 --- a/lib/libssl/src/crypto/x509v3/v3_ocsp.c +++ b/lib/libssl/src/crypto/x509v3/v3_ocsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_ocsp.c,v 1.8 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: v3_ocsp.c,v 1.9 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_OCSP #include "cryptlib.h" diff --git a/lib/libssl/src/crypto/x509v3/v3_purp.c b/lib/libssl/src/crypto/x509v3/v3_purp.c index 02538335ae9..0d4b9aae648 100644 --- a/lib/libssl/src/crypto/x509v3/v3_purp.c +++ b/lib/libssl/src/crypto/x509v3/v3_purp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3_purp.c,v 1.19 2014/07/10 13:58:23 jsing Exp $ */ +/* $OpenBSD: v3_purp.c,v 1.20 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -59,6 +59,8 @@ #include <stdio.h> #include <string.h> +#include <openssl/opensslconf.h> + #include "cryptlib.h" #include <openssl/x509v3.h> #include <openssl/x509_vfy.h> diff --git a/lib/libssl/src/crypto/x509v3/v3err.c b/lib/libssl/src/crypto/x509v3/v3err.c index eaa7cdf8d58..a49632a0698 100644 --- a/lib/libssl/src/crypto/x509v3/v3err.c +++ b/lib/libssl/src/crypto/x509v3/v3err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v3err.c,v 1.10 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: v3err.c,v 1.11 2014/07/10 22:45:58 jsing Exp $ */ /* ==================================================================== * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * @@ -59,6 +59,9 @@ */ #include <stdio.h> + +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/x509v3.h> diff --git a/lib/libssl/src/crypto/x509v3/x509v3.h b/lib/libssl/src/crypto/x509v3/x509v3.h index 73ef3ecc572..a88223cd9b7 100644 --- a/lib/libssl/src/crypto/x509v3/x509v3.h +++ b/lib/libssl/src/crypto/x509v3/x509v3.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509v3.h,v 1.14 2014/06/12 15:49:31 deraadt Exp $ */ +/* $OpenBSD: x509v3.h,v 1.15 2014/07/10 22:45:58 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -58,6 +58,8 @@ #ifndef HEADER_X509V3_H #define HEADER_X509V3_H +#include <openssl/opensslconf.h> + #include <openssl/bio.h> #include <openssl/x509.h> #include <openssl/conf.h> |