e_os.h removal from other headers and source files.

Removed e_os.h from all bar three headers (apps/apps.h crypto/bio/bio_lcl.h and
ssl/ssl_locl.h).

Added e_os.h into the files that need it now.

Directly reference internal/nelem.h when required.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4188)
This commit is contained in:
Pauli 2017-08-18 13:52:46 +10:00
parent 58891025ef
commit 677963e5a4
55 changed files with 90 additions and 51 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -10,6 +10,7 @@
#ifndef HEADER_APPS_H
# define HEADER_APPS_H
# include "internal/nelem.h"
# include "e_os.h"
# if defined(__unix) || defined(__unix__)
# include <sys/time.h> /* struct timeval for DTLS */

View file

@ -1,5 +1,5 @@
/*
* Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -7,8 +7,9 @@
* https://www.openssl.org/source/license.html
*/
#include <stdio.h>
#include "e_os.h" /* for strncasecmp */
#include "internal/cryptlib.h"
#include <stdio.h>
#include <openssl/asn1t.h>
#include <openssl/x509.h>
#include <openssl/engine.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -10,6 +10,7 @@
#include <stddef.h>
#include <string.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/asn1.h>
#include <openssl/asn1t.h>
#include <openssl/objects.h>

View file

@ -26,7 +26,6 @@
# include <ucontext.h>
# include <setjmp.h>
# include "e_os.h"
typedef struct async_fibre_st {
ucontext_t fibre;

View file

@ -1,5 +1,5 @@
/*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -15,7 +15,6 @@
*/
#include <string.h>
#include "e_os.h"
static ossl_inline uint32_t load32(const uint8_t *src)
{

View file

@ -1,5 +1,5 @@
/*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -15,7 +15,6 @@
*/
#include <stddef.h>
#include "e_os.h"
#define BLAKE2S_BLOCKBYTES 64
#define BLAKE2S_OUTBYTES 32

View file

@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -8,7 +8,7 @@
*/
#include "bn_lcl.h"
#include "e_os.h"
#include "internal/nelem.h"
#ifndef OPENSSL_NO_DH
#include <openssl/dh.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -8,7 +8,7 @@
*/
#include "bn_lcl.h"
#include "e_os.h"
#include "internal/nelem.h"
#ifndef OPENSSL_NO_SRP

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -7,8 +7,6 @@
* https://www.openssl.org/source/license.html
*/
#include "e_os.h"
#ifdef OPENSSL_SYS_WIN32
# include <stdlib.h>
#endif

View file

@ -11,6 +11,7 @@
#include <ctype.h>
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include "internal/conf.h"
#include "internal/dso.h"
#include <openssl/x509.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 1998-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1998-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
*
* Licensed under the OpenSSL license (the "License"). You may not use
@ -9,6 +9,7 @@
*/
#include "internal/cryptlib_int.h"
#include "e_os.h"
#include <openssl/safestack.h>
#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy

View file

@ -9,6 +9,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/bn.h>
#include "dh_locl.h"
#include <openssl/engine.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -8,6 +8,7 @@
*/
#include "internal/cryptlib_int.h"
#include "e_os.h"
#if defined(_WIN32) || defined(__CYGWIN__)
# ifdef __CYGWIN__

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -11,6 +11,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/bn.h>
#include "dsa_locl.h"
#include <openssl/asn1.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -8,6 +8,7 @@
*/
#include "dso_locl.h"
#include "e_os.h"
static DSO_METHOD *default_DSO_meth = NULL;

View file

@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -7,6 +7,7 @@
* https://www.openssl.org/source/license.html
*/
#include "e_os.h"
#include "dso_locl.h"
#if defined(DSO_WIN32)

View file

@ -12,6 +12,7 @@
#include <openssl/err.h>
#include <openssl/asn1t.h>
#include <openssl/objects.h>
#include "internal/nelem.h"
int EC_GROUP_get_basis_type(const EC_GROUP *group)
{

View file

@ -13,7 +13,7 @@
#include <openssl/err.h>
#include <openssl/obj_mac.h>
#include <openssl/opensslconf.h>
#include "e_os.h"
#include "internal/nelem.h"
typedef struct {
int field_type, /* either NID_X9_62_prime_field or

View file

@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2002-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
*
* Licensed under the OpenSSL license (the "License"). You may not use
@ -11,6 +11,7 @@
#include "internal/cryptlib.h"
#include <string.h>
#include "ec_lcl.h"
#include "e_os.h"
#include <openssl/err.h>
#include <openssl/engine.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
*
* Licensed under the OpenSSL license (the "License"). You may not use
@ -15,8 +15,6 @@
#include <openssl/bn.h>
#include "internal/refcount.h"
#include "e_os.h"
#if defined(__SUNPRO_C)
# if __SUNPRO_C >= 0x520
# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)

View file

@ -1,5 +1,5 @@
/*
* Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
*
* Licensed under the OpenSSL license (the "License"). You may not use
@ -14,6 +14,7 @@
#include "internal/cryptlib.h"
#include "internal/bn_int.h"
#include "ec_lcl.h"
#include "e_os.h"
/*
* This file implements the wNAF-based interleaving multi-exponentiation method

View file

@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2014-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2014, Intel Corporation. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
@ -21,6 +21,7 @@
#include "internal/cryptlib.h"
#include "internal/bn_int.h"
#include "ec_lcl.h"
#include "e_os.h"
#if BN_BITS2 != 64
# define TOBN(hi,lo) lo,hi

View file

@ -1,5 +1,5 @@
/*
* Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -8,6 +8,7 @@
*/
#include "eng_int.h"
#include "e_os.h"
/*
* Initialise a engine type for use (or up its functional reference count if

View file

@ -8,6 +8,7 @@
*/
#include "eng_int.h"
#include "e_os.h"
#include <openssl/rand.h>
#include "internal/refcount.h"

View file

@ -1,5 +1,5 @@
/*
* Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -8,6 +8,7 @@
*/
#include "eng_int.h"
#include "e_os.h"
#include <openssl/evp.h>
#include "internal/asn1_int.h"

View file

@ -9,6 +9,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/bn.h>
#include <openssl/err.h>
#include <openssl/objects.h>

View file

@ -25,6 +25,7 @@
#include "internal/thread_once.h"
#include "internal/dso.h"
#include "internal/store.h"
#include "e_os.h"
static int stopped = 0;

View file

@ -11,6 +11,7 @@
#include <stdlib.h>
#include <limits.h>
#include <openssl/crypto.h>
#include "e_os.h"
#include "internal/cryptlib.h"
#include "internal/cryptlib_int.h"
#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE

View file

@ -1,5 +1,5 @@
/*
* Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2006-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -9,7 +9,7 @@
#include <openssl/objects.h>
#include "obj_xref.h"
#include "e_os.h"
#include "internal/nelem.h"
static STACK_OF(nid_triple) *sig_app, *sigx_app;

View file

@ -10,6 +10,7 @@
#include <stdio.h>
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/lhash.h>
#include "internal/bn_int.h"
#include <openssl/engine.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -10,6 +10,7 @@
#include <openssl/e_os2.h>
#include <openssl/err.h>
#include <openssl/ui.h>
#include "e_os.h"
#ifndef OPENSSL_NO_UI_CONSOLE
/*

View file

@ -13,6 +13,7 @@
#include <sys/types.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#ifndef OPENSSL_NO_POSIX_IO
# include <sys/stat.h>

View file

@ -9,6 +9,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/lhash.h>
#include <openssl/x509.h>
#include "internal/x509_int.h"

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -9,6 +9,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/asn1.h>
#include <openssl/objects.h>
#include <openssl/evp.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -9,6 +9,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/asn1.h>
#include <openssl/objects.h>
#include <openssl/evp.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2003-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2003-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -7,8 +7,10 @@
* https://www.openssl.org/source/license.html
*/
#include "e_os.h" /* for strncasecmp */
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include "internal/asn1_int.h"
#include <openssl/asn1t.h>
#include <openssl/conf.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -9,6 +9,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include "e_os.h"
#include "internal/o_str.h"
#include <openssl/asn1t.h>
#include <openssl/conf.h>

View file

@ -12,6 +12,7 @@
#include <stdio.h>
#include "internal/ctype.h"
#include "internal/cryptlib.h"
#include "e_os.h"
#include <openssl/conf.h>
#include <openssl/x509v3.h>
#include "internal/x509_int.h"

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -13,8 +13,6 @@
# include <stdlib.h>
# include <string.h>
# include "e_os.h"
# ifdef OPENSSL_USE_APPLINK
# undef BIO_FLAGS_UPLINK
# define BIO_FLAGS_UPLINK 0x8000
@ -25,6 +23,7 @@
# include <openssl/buffer.h>
# include <openssl/bio.h>
# include <openssl/err.h>
# include "internal/nelem.h"
#ifdef __cplusplus
extern "C" {

View file

@ -1,5 +1,5 @@
/*
* Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2005-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -11,6 +11,7 @@
#include <openssl/objects.h>
#include <openssl/rand.h>
#include "ssl_locl.h"
#include "e_os.h"
#if defined(OPENSSL_SYS_VXWORKS)
# include <sys/times.h>

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy

View file

@ -11,7 +11,9 @@
#include <stdio.h>
#include <openssl/objects.h>
#include "internal/nelem.h"
#include "ssl_locl.h"
#include "e_os.h"
#include <openssl/md5.h>
#include <openssl/dh.h>
#include <openssl/rand.h>

View file

@ -11,7 +11,11 @@
#include <stdio.h>
#include <sys/types.h>
#include "e_os.h"
#include "internal/nelem.h"
#ifndef NO_SYS_TYPES_H
# include <sys/types.h>
#endif
#include "internal/o_dir.h"
#include <openssl/lhash.h>
#include <openssl/bio.h>
@ -20,6 +24,7 @@
#include <openssl/dh.h>
#include <openssl/bn.h>
#include <openssl/crypto.h>
#include "e_os.h"
#include "ssl_locl.h"
#include "ssl_cert_table.h"
#include "internal/thread_once.h"

View file

@ -15,6 +15,7 @@
#include <openssl/comp.h>
#include <openssl/engine.h>
#include <openssl/crypto.h>
#include "internal/nelem.h"
#include "ssl_locl.h"
#include "internal/thread_once.h"
#include "internal/cryptlib.h"

View file

@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2012-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -12,6 +12,7 @@
#include <openssl/conf.h>
#include <openssl/objects.h>
#include <openssl/dh.h>
#include "internal/nelem.h"
/*
* structure holding name tables. This is used for permitted elements in lists

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
* Copyright 2005 Nokia. All rights reserved.
*
@ -10,6 +10,7 @@
*/
#include <stdio.h>
#include "e_os.h"
#include "ssl_locl.h"
#include <openssl/objects.h>
#include <openssl/lhash.h>

View file

@ -16,7 +16,7 @@
# include <string.h>
# include <errno.h>
# include "e_os.h"
# include "e_os.h" /* struct timeval for Windows */
# if defined(__unix) || defined(__unix__)
# include <sys/time.h> /* struct timeval for DTLS */
# endif

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2005 Nokia. All rights reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
@ -12,6 +12,7 @@
#include <openssl/lhash.h>
#include <openssl/rand.h>
#include <openssl/engine.h>
#include "e_os.h"
#include "ssl_locl.h"
#include "statem/statem_locl.h"

View file

@ -8,6 +8,7 @@
*/
#include <string.h>
#include "internal/nelem.h"
#include "../ssl_locl.h"
#include "statem_locl.h"

View file

@ -1,5 +1,5 @@
/*
* Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -8,6 +8,7 @@
*/
#include <openssl/rand.h>
#include "e_os.h"
#include "../ssl_locl.h"
#include "statem_locl.h"

View file

@ -1,5 +1,5 @@
/*
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@ -17,6 +17,7 @@
#include <openssl/x509v3.h>
#include <openssl/dh.h>
#include <openssl/bn.h>
#include "internal/nelem.h"
#include "ssl_locl.h"
#include <openssl/ct.h>

View file

@ -19,6 +19,7 @@
#include "testutil.h"
#include "internal/nelem.h"
#ifndef OPENSSL_NO_BF
# include <openssl/blowfish.h>

View file

@ -9,7 +9,7 @@
#include "testutil.h"
#include "internal/ctype.h"
#include "../e_os.h"
#include "internal/nelem.h"
#include <ctype.h>
#include <stdio.h>

View file

@ -22,6 +22,7 @@
# pragma names restore
#endif
#include "internal/nelem.h"
#include "testutil.h"
/*