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/blake2 | |
parent | 58891025eff2fb42a6a5cf2fa861d46308826d07 (diff) | |
download | openssl-677963e5a428739062ab5d46d5baed5eadd0195d.zip openssl-677963e5a428739062ab5d46d5baed5eadd0195d.tar.gz openssl-677963e5a428739062ab5d46d5baed5eadd0195d.tar.bz2 |
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/blake2')
-rw-r--r-- | crypto/blake2/blake2_impl.h | 3 | ||||
-rw-r--r-- | crypto/blake2/blake2_locl.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crypto/blake2/blake2_impl.h b/crypto/blake2/blake2_impl.h index 8fe5c95..80b717e 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 <string.h> -#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 fb7beb9..926bae9 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 <stddef.h> -#include "e_os.h" #define BLAKE2S_BLOCKBYTES 64 #define BLAKE2S_OUTBYTES 32 |