projects
/
platform
/
upstream
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3c7871
)
Fix build when BSAES_ASM is defined but VPAES_ASM is not
author
Emilia Kasper
<emilia@openssl.org>
Tue, 19 Aug 2014 14:28:07 +0000
(16:28 +0200)
committer
Janusz Kozerski
<j.kozerski@samsung.com>
Mon, 20 Oct 2014 13:25:34 +0000
(15:25 +0200)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit
da92be4d68bec81030838e3228ef0238c565af85
)
crypto/evp/e_aes.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_aes.c
b/crypto/evp/e_aes.c
index
07bf83a
..
dc3c2a1
100644
(file)
--- a/
crypto/evp/e_aes.c
+++ b/
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