forked from mirrors/kore
update for latest master changes
This commit is contained in:
parent
e4e8093bc3
commit
2516abdfa2
|
@ -63,11 +63,6 @@
|
||||||
#define RAND_POLL_INTERVAL (1800 * 1000)
|
#define RAND_POLL_INTERVAL (1800 * 1000)
|
||||||
#define RAND_FILE_SIZE 1024
|
#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__)
|
#if defined(__linux__)
|
||||||
#include "seccomp.h"
|
#include "seccomp.h"
|
||||||
|
|
||||||
|
@ -705,7 +700,7 @@ keymgr_acme_init(void)
|
||||||
kore_log(LOG_INFO, "loaded existing ACME account key");
|
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);
|
rsa = EVP_PKEY_get0_RSA(key->pkey);
|
||||||
be = RSA_get0_e(rsa);
|
be = RSA_get0_e(rsa);
|
||||||
bn = RSA_get0_n(rsa);
|
bn = RSA_get0_n(rsa);
|
||||||
|
|
|
@ -150,11 +150,13 @@ kore_worker_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (keymgr_active) {
|
if (keymgr_active) {
|
||||||
|
#if defined(KORE_USE_ACME)
|
||||||
/* The ACME process is only started if we need it. */
|
/* The ACME process is only started if we need it. */
|
||||||
if (acme_provider) {
|
if (acme_provider) {
|
||||||
kore_worker_spawn(KORE_WORKER_ACME_IDX,
|
kore_worker_spawn(KORE_WORKER_ACME_IDX,
|
||||||
KORE_WORKER_ACME, 0);
|
KORE_WORKER_ACME, 0);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Now we can start the keymgr. */
|
/* Now we can start the keymgr. */
|
||||||
kore_worker_spawn(KORE_WORKER_KEYMGR_IDX,
|
kore_worker_spawn(KORE_WORKER_KEYMGR_IDX,
|
||||||
|
|
Loading…
Reference in New Issue