From 2516abdfa2ce77f38e9222ca0350d5f2c10cf63c Mon Sep 17 00:00:00 2001
From: Joris Vink <joris@coders.se>
Date: Mon, 28 Oct 2019 12:45:08 +0100
Subject: [PATCH] update for latest master changes

---
 src/keymgr.c | 7 +------
 src/worker.c | 2 ++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/keymgr.c b/src/keymgr.c
index f64a267..6eb3cbf 100644
--- a/src/keymgr.c
+++ b/src/keymgr.c
@@ -63,11 +63,6 @@
 #define RAND_POLL_INTERVAL	(1800 * 1000)
 #define RAND_FILE_SIZE		1024
 
-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3000000fL
-#undef OPENSSL_VERSION_NUMBER
-#define OPENSSL_VERSION_NUMBER 0x10100000L
-#endif
-
 #if defined(__linux__)
 #include "seccomp.h"
 
@@ -705,7 +700,7 @@ keymgr_acme_init(void)
 		kore_log(LOG_INFO, "loaded existing ACME account key");
 	}
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if defined(KORE_OPENSSL_NEWER_API)
 	rsa = EVP_PKEY_get0_RSA(key->pkey);
 	be = RSA_get0_e(rsa);
 	bn = RSA_get0_n(rsa);
diff --git a/src/worker.c b/src/worker.c
index 0c2f902..0807bf4 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -150,11 +150,13 @@ kore_worker_init(void)
 	}
 
 	if (keymgr_active) {
+#if defined(KORE_USE_ACME)
 		/* The ACME process is only started if we need it. */
 		if (acme_provider) {
 			kore_worker_spawn(KORE_WORKER_ACME_IDX,
 			    KORE_WORKER_ACME, 0);
 		}
+#endif
 
 		/* Now we can start the keymgr. */
 		kore_worker_spawn(KORE_WORKER_KEYMGR_IDX,