summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtoorop <willem@nlnetlabs.nl>2019-03-16 09:47:06 +0100
committerGitHub <noreply@github.com>2019-03-16 09:47:06 +0100
commit7d957a6b78897e3b15566a98788836a9288ff9ca (patch)
tree3f216cc0db412ddb21b227ea69a8ee6f8b128004
parent4f0bdb2cda19cf84a35a048fac68bab0eeeb9eba (diff)
parente342a344c87c4f60c731654d9899e9422ba96dd3 (diff)
downloadldns-7d957a6b78897e3b15566a98788836a9288ff9ca.tar.gz
Merge pull request #4 from neheb/patch-1
Make OpenSSL ENGINE support optional
-rw-r--r--keys.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/keys.c b/keys.c
index bb7bd6cd..2a8593df 100644
--- a/keys.c
+++ b/keys.c
@@ -16,8 +16,10 @@
#ifdef HAVE_SSL
#include <openssl/ssl.h>
-#include <openssl/engine.h>
#include <openssl/rand.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
#endif /* HAVE_SSL */
ldns_lookup_table ldns_signing_algorithms[] = {
@@ -99,7 +101,7 @@ ldns_key_new_frm_fp(ldns_key **k, FILE *fp)
return ldns_key_new_frm_fp_l(k, fp, NULL);
}
-#ifdef HAVE_SSL
+#if defined(HAVE_SSL) && !defined(OPENSSL_NO_ENGINE)
ldns_status
ldns_key_new_frm_engine(ldns_key **key, ENGINE *e, char *key_id, ldns_algorithm alg)
{