From 677963e5a428739062ab5d46d5baed5eadd0195d Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 18 Aug 2017 13:52:46 +1000 Subject: 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 Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/4188) --- crypto/blake2/blake2_impl.h | 3 +-- crypto/blake2/blake2_locl.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'crypto/blake2') diff --git a/crypto/blake2/blake2_impl.h b/crypto/blake2/blake2_impl.h index 8fe5c95915..80b717e79c 100644 --- a/crypto/blake2/blake2_impl.h +++ b/crypto/blake2/blake2_impl.h @@ -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 -#include "e_os.h" static ossl_inline uint32_t load32(const uint8_t *src) { diff --git a/crypto/blake2/blake2_locl.h b/crypto/blake2/blake2_locl.h index fb7beb976c..926bae944c 100644 --- a/crypto/blake2/blake2_locl.h +++ b/crypto/blake2/blake2_locl.h @@ -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 -#include "e_os.h" #define BLAKE2S_BLOCKBYTES 64 #define BLAKE2S_OUTBYTES 32 -- cgit v1.2.3