Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
96cd6c4028
|
@ -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