diff options
author | Pauli <paul.dale@oracle.com> | 2017-08-18 05:52:46 +0200 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-08-29 23:20:43 +0200 |
commit | 677963e5a428739062ab5d46d5baed5eadd0195d (patch) | |
tree | 3afe5ace573d0da8a5272575075ad4aede8dcec5 /crypto/asn1 | |
parent | Make the global DRBGs static (diff) | |
download | openssl-677963e5a428739062ab5d46d5baed5eadd0195d.tar.xz openssl-677963e5a428739062ab5d46d5baed5eadd0195d.zip |
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/asn1')
-rw-r--r-- | crypto/asn1/ameth_lib.c | 5 | ||||
-rw-r--r-- | crypto/asn1/tasn_utl.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index c677917c2f..82868e1366 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -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> diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c index 9fc4cc2642..5f7e4fbde2 100644 --- a/crypto/asn1/tasn_utl.c +++ b/crypto/asn1/tasn_utl.c @@ -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> |