diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 19:59:47 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-10-18 20:57:02 -0400 |
| commit | 8aa7b05b29941b07940857ff6f60bcc60eaa59a9 (patch) | |
| tree | acf3d988cfbd1977723f93285bda5152d096b92e /openssl/crypto/evp/e_aes.c | |
| parent | d2d01e39531d9fb823b2271244c324aad0a6575d (diff) | |
| download | vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.gz vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.tar.bz2 vcxsrv-8aa7b05b29941b07940857ff6f60bcc60eaa59a9.zip | |
Update openssl to version openssl-1.0.1j
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
Diffstat (limited to 'openssl/crypto/evp/e_aes.c')
| -rw-r--r-- | openssl/crypto/evp/e_aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/crypto/evp/e_aes.c b/openssl/crypto/evp/e_aes.c index 07bf83a60..dc3c2a162 100644 --- a/openssl/crypto/evp/e_aes.c +++ b/openssl/crypto/evp/e_aes.c @@ -166,7 +166,7 @@ extern unsigned int OPENSSL_ia32cap_P[2]; #define VPAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32))) #endif #ifdef BSAES_ASM -#define BSAES_CAPABLE VPAES_CAPABLE +#define BSAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32))) #endif /* * AES-NI section |