diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-07 09:09:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-07 09:09:06 -0500 |
| commit | a415fee58abf7285e4d42652755b8f34da273f6d (patch) | |
| tree | a73a1d25780d70f5cce92834bb74ea4746b32a3b /src | |
| parent | 4e15c2cb7d905bd981aaae45aa2f186424b33040 (diff) | |
| parent | ce8a1e25a2a7ea7f4c7ce72932b7ee08fa05b7d3 (diff) | |
| download | tor-a415fee58abf7285e4d42652755b8f34da273f6d.tar.gz tor-a415fee58abf7285e4d42652755b8f34da273f6d.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/aes.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/common/aes.c b/src/common/aes.c index ef94d8a75c..35c2d1e3a5 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -56,7 +56,14 @@ ENABLE_GCC_WARNING(redundant-decls) * gives us, and the best possible counter-mode implementation, and combine * 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(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) || defined(__INTEL__)) \ |