summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/evp/e_aes.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/evp/e_aes.c')
-rw-r--r--src/lib/libcrypto/evp/e_aes.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index a6d48085c3..25199dca36 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: e_aes.c,v 1.29 2015/09/10 15:56:25 jsing Exp $ */ 1/* $OpenBSD: e_aes.c,v 1.30 2016/11/04 13:56:05 miod Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -143,14 +143,14 @@ void AES_xts_decrypt(const char *inp, char *out, size_t len,
143 const AES_KEY *key1, const AES_KEY *key2, const unsigned char iv[16]); 143 const AES_KEY *key1, const AES_KEY *key2, const unsigned char iv[16]);
144#endif 144#endif
145 145
146#if defined(AES_ASM) && !defined(I386_ONLY) && ( \ 146#if defined(AES_ASM) && ( \
147 ((defined(__i386) || defined(__i386__) || \ 147 ((defined(__i386) || defined(__i386__) || \
148 defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \ 148 defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \
149 defined(__x86_64) || defined(__x86_64__) || \ 149 defined(__x86_64) || defined(__x86_64__) || \
150 defined(_M_AMD64) || defined(_M_X64) || \ 150 defined(_M_AMD64) || defined(_M_X64) || \
151 defined(__INTEL__) ) 151 defined(__INTEL__) )
152 152
153extern unsigned int OPENSSL_ia32cap_P[2]; 153extern unsigned int OPENSSL_ia32cap_P[];
154 154
155#ifdef VPAES_ASM 155#ifdef VPAES_ASM
156#define VPAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32))) 156#define VPAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32)))