mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-28 06:13:31 +01:00
Always Use EVP_aes_*_ctr() with openssl 1.1
(OpenSSL 1.1 makes EVP_CIPHER_CTX opaque, _and_ adds acceleration for counter mode on more architectures. So it won't work if we try the older approach, and it might help if we try the newer one.) Fixes bug 20588.
This commit is contained in:
parent
f6a3d213e4
commit
0bd55ed96a
3
changes/bug20588
Normal file
3
changes/bug20588
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
o Minor bugfixes (portability):
|
||||||
|
- Fix compilation with OpenSSL 1.1 and less commonly-used
|
||||||
|
CPU architectures. Closes ticket 20588.
|
@ -56,7 +56,14 @@ ENABLE_GCC_WARNING(redundant-decls)
|
|||||||
* gives us, and the best possible counter-mode implementation, and combine
|
* gives us, and the best possible counter-mode implementation, and combine
|
||||||
* them.
|
* them.
|
||||||
*/
|
*/
|
||||||
#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_NOPATCH(1,0,1) && \
|
#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_NOPATCH(1,1,0)
|
||||||
|
|
||||||
|
/* With newer OpenSSL versions, the older fallback modes don't compile. So
|
||||||
|
* don't use them, even if we lack specific acceleration. */
|
||||||
|
|
||||||
|
#define USE_EVP_AES_CTR
|
||||||
|
|
||||||
|
#elif OPENSSL_VERSION_NUMBER >= OPENSSL_V_NOPATCH(1,0,1) && \
|
||||||
(defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
|
(defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
|
||||||
defined(__x86_64) || defined(__x86_64__) || \
|
defined(__x86_64) || defined(__x86_64__) || \
|
||||||
defined(_M_AMD64) || defined(_M_X64) || defined(__INTEL__)) \
|
defined(_M_AMD64) || defined(_M_X64) || defined(__INTEL__)) \
|
||||||
|
Loading…
Reference in New Issue
Block a user