diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-08-24 11:28:19 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-09-01 15:41:58 +0200 |
| commit | 24fd8541d47a46052b975db98b465faa7e4d898c (patch) | |
| tree | fbe9188d876ba1ad776b57ee6c66197166299dfb /include/internal | |
| parent | 2f9789f7e7e8f17da32e1cadbbc3c398f99f2d23 (diff) | |
Remove extern declarations of OPENSSL_ia32cap_P
Use the header file internal/cryptlib.h instead.
Remove checks for OPENSSL_NO_ASM and I386_ONLY
in cryptlib.c, to match the checks in other
places where OPENSSL_ia32cap_P is used and
assumed to be initialized.
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/9688)
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/cryptlib.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index d54ca24ee1..d591f203d2 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -84,7 +84,11 @@ DEFINE_LHASH_OF(MEM); # define HEX_SIZE(type) (sizeof(type)*2) void OPENSSL_cpuid_setup(void); +#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ + defined(__x86_64) || defined(__x86_64__) || \ + defined(_M_AMD64) || defined(_M_X64) extern unsigned int OPENSSL_ia32cap_P[]; +#endif void OPENSSL_showfatal(const char *fmta, ...); int do_ex_data_init(OPENSSL_CTX *ctx); void crypto_cleanup_all_ex_data_int(OPENSSL_CTX *ctx); |