diff options
author | Pauli <paul.dale@oracle.com> | 2017-08-18 13:52:46 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-08-30 07:20:43 +1000 |
commit | 677963e5a428739062ab5d46d5baed5eadd0195d (patch) | |
tree | 3afe5ace573d0da8a5272575075ad4aede8dcec5 /crypto/ec | |
parent | 58891025eff2fb42a6a5cf2fa861d46308826d07 (diff) |
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)
Diffstat (limited to 'crypto/ec')
-rw-r--r-- | crypto/ec/ec_asn1.c | 1 | ||||
-rw-r--r-- | crypto/ec/ec_curve.c | 2 | ||||
-rw-r--r-- | crypto/ec/ec_key.c | 3 | ||||
-rw-r--r-- | crypto/ec/ec_lcl.h | 4 | ||||
-rw-r--r-- | crypto/ec/ec_mult.c | 3 | ||||
-rw-r--r-- | crypto/ec/ecp_nistz256.c | 3 |
6 files changed, 9 insertions, 7 deletions
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index d57f3b4649..5e3fbe82e7 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -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) { diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c index b9eb9939c4..99288fe59c 100644 --- a/crypto/ec/ec_curve.c +++ b/crypto/ec/ec_curve.c @@ -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 diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c index 6aa204eed0..882c882296 100644 --- a/crypto/ec/ec_key.c +++ b/crypto/ec/ec_key.c @@ -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> diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index 4b65c325af..6cc0190aa7 100644 --- a/crypto/ec/ec_lcl.h +++ b/crypto/ec/ec_lcl.h @@ -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) diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c index 308cb52d49..6f75416425 100644 --- a/crypto/ec/ec_mult.c +++ b/crypto/ec/ec_mult.c @@ -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 diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c index 16557d77f2..edea1f8810 100644 --- a/crypto/ec/ecp_nistz256.c +++ b/crypto/ec/ecp_nistz256.c @@ -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 |