Commit ce8a1e25 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'bug20588' into maint-0.2.9

parents f6a3d213 0bd55ed9

changes/bug20588

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (portability):

    - Fix compilation with OpenSSL 1.1 and less commonly-used

      CPU architectures. Closes ticket 20588.

src/common/aes.c

+8 −1
Original line number Diff line number Diff line
@@ -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__))          \