From: Emilia Kasper <emilia@openssl.org>
Date: Tue, 19 Aug 2014 14:28:07 +0000 (+0200)
Subject: Fix build when BSAES_ASM is defined but VPAES_ASM is not
X-Git-Tag: master-pre-reformat~414
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da92be4d68bec81030838e3228ef0238c565af85;p=thirdparty%2Fopenssl.git

Fix build when BSAES_ASM is defined but VPAES_ASM is not

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 8ab434943a6..776262343c1 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -181,7 +181,7 @@ extern unsigned int OPENSSL_ia32cap_P[];
 #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