diff options
| author | Hans Nilsson <[email protected]> | 2018-05-04 12:17:30 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-05-04 12:21:59 +0200 |
| commit | cb1a8a13adcf53ff08a9ea7023b24c760885f7d4 (patch) | |
| tree | 68d4047164e1efe67d79b314f33e061369003995 /lib | |
| parent | 0c0054aabef5a76e32957dbfa583cabeb051a8d0 (diff) | |
| download | otp-cb1a8a13adcf53ff08a9ea7023b24c760885f7d4.tar.gz otp-cb1a8a13adcf53ff08a9ea7023b24c760885f7d4.tar.bz2 otp-cb1a8a13adcf53ff08a9ea7023b24c760885f7d4.zip | |
crypto: Disable test_engine if engine is disabled
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/c_src/otp_test_engine.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/crypto/c_src/otp_test_engine.c b/lib/crypto/c_src/otp_test_engine.c index 5c6122c06a..d0e23a2a3e 100644 --- a/lib/crypto/c_src/otp_test_engine.c +++ b/lib/crypto/c_src/otp_test_engine.c @@ -24,10 +24,8 @@ #include <stdio.h> #include <string.h> -#include <openssl/engine.h> #include <openssl/md5.h> #include <openssl/rsa.h> -#include <openssl/pem.h> #define PACKED_OPENSSL_VERSION(MAJ, MIN, FIX, P) \ ((((((((MAJ << 8) | MIN) << 8 ) | FIX) << 8) | (P-'a'+1)) << 4) | 0xf) @@ -40,6 +38,21 @@ #define OLD #endif +#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'o') \ + && !defined(OPENSSL_NO_EC) \ + && !defined(OPENSSL_NO_ECDH) \ + && !defined(OPENSSL_NO_ECDSA) +# define HAVE_EC +#endif + +#if defined(HAVE_EC) +/* If OPENSSL_NO_EC is set, there will be an error in ec.h included from engine.h + So if EC is disabled, you can't use Engine either.... +*/ +#include <openssl/engine.h> +#include <openssl/pem.h> + + static const char *test_engine_id = "MD5"; static const char *test_engine_name = "MD5 test engine"; @@ -262,3 +275,5 @@ int pem_passwd_cb_fun(char *buf, int size, int rwflag, void *password) return 0; } } + +#endif |