From 35eac8acb8c47416a0fde79280a2fef60bc9339e Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Wed, 12 Sep 2018 10:42:10 +0200 Subject: crypto: Change condition for RSA_PKCS1_PSS Trubble on a couple of cross-building machines --- lib/crypto/c_src/crypto.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c index ad84d9cd35..592027d946 100644 --- a/lib/crypto/c_src/crypto.c +++ b/lib/crypto/c_src/crypto.c @@ -215,13 +215,12 @@ # define HAVE_RSA_SSLV23_PADDING #endif -// OpenSSL >= 1.0.2 -#ifdef RSA_PKCS1_PSS_PADDING -# define HAVE_RSA_PKCS1_PSS_PADDING +#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0) +# ifdef RSA_PKCS1_PSS_PADDING +# define HAVE_RSA_PKCS1_PSS_PADDING +# endif #endif - - #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'h') \ && defined(HAVE_EC) /* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h -- cgit v1.2.1