summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Nilsson <hans@erlang.org>2018-09-12 10:42:10 +0200
committerHans Nilsson <hans@erlang.org>2018-09-14 11:58:37 +0200
commit35eac8acb8c47416a0fde79280a2fef60bc9339e (patch)
tree12fc031dbff5a2dbe4e9883c1121bd04330b63f8
parent769c73a8cbe40c865d337d1d2eb651ea1ea68e31 (diff)
downloaderlang-35eac8acb8c47416a0fde79280a2fef60bc9339e.tar.gz
crypto: Change condition for RSA_PKCS1_PSS
Trubble on a couple of cross-building machines
-rw-r--r--lib/crypto/c_src/crypto.c9
1 files 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