sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2016-11-07 09:09:14 -05:00
parent 27039cbc26 ce8a1e25a2
commit 96cd6c4028
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug20588 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (portability):
- Fix compilation with OpenSSL 1.1 and less commonly-used
CPU architectures. Closes ticket 20588.

9
src/common/aes.c
View File

@ -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__)) \