blackbeard420/kore
1
0
Fork 0
mirror of https://github.com/jorisvink/kore synced 2025-03-09 12:39:01 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 3.0.0-releng

Browse Source
This commit is contained in:
Joris Vink 2019-01-21 10:58:03 +01:00
commit cc2b0a3902
5 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/kore/kore.h
View File

@ -411,9 +411,7 @@ struct kore_domain {
#if !defined(KORE_NO_TLS)
char *cafile;
char *crlfile;
time_t crl_mtime;
char *certfile;
time_t cert_mtime;
char *certkey;
SSL_CTX *ssl_ctx;
int x509_verify_depth;

7
src/connection.c
View File

@ -305,13 +305,6 @@ kore_connection_handle(struct connection *c)
c->cert = NULL;
}
r = SSL_get_verify_result(c->ssl);
if (r != X509_V_OK) {
kore_debug("SSL_get_verify_result(): %d, %s",
r, ssl_errno_s);
return (KORE_RESULT_ERROR);
}
if (c->owner != NULL) {
listener = (struct listener *)c->owner;
if (listener->connect != NULL) {

3
src/domain.c
View File

@ -210,9 +210,6 @@ kore_domain_new(char *domain)
dom->ssl_ctx = NULL;
dom->certfile = NULL;
dom->crlfile = NULL;
dom->crl_mtime = 0;
dom->cert_mtime = 0;
dom->x509_verify_depth = 1;
#endif
dom->domain = kore_strdup(domain);

20
src/keymgr.c
View File

@ -73,7 +73,7 @@ static void keymgr_entropy_request(struct kore_msg *, const void *);
static void keymgr_certificate_request(struct kore_msg *, const void *);
static void keymgr_submit_certificates(struct kore_domain *, u_int16_t);
static void keymgr_submit_file(u_int8_t, struct kore_domain *,
const char *, u_int16_t, time_t *, int);
const char *, u_int16_t, int);
static void keymgr_rsa_encrypt(struct kore_msg *, const void *,
struct key *);
@ -197,18 +197,15 @@ keymgr_reload(void)
static void
keymgr_submit_certificates(struct kore_domain *dom, u_int16_t dst)
{
keymgr_submit_file(KORE_MSG_CERTIFICATE,
dom, dom->certfile, dst, &dom->cert_mtime, 0);
keymgr_submit_file(KORE_MSG_CERTIFICATE, dom, dom->certfile, dst, 0);
if (dom->crlfile != NULL) {
keymgr_submit_file(KORE_MSG_CRL,
dom, dom->crlfile, dst, &dom->crl_mtime, 1);
}
if (dom->crlfile != NULL)
keymgr_submit_file(KORE_MSG_CRL, dom, dom->crlfile, dst, 1);
}
static void
keymgr_submit_file(u_int8_t id, struct kore_domain *dom,
const char *file, u_int16_t dst, time_t *mtime, int can_fail)
const char *file, u_int16_t dst, int can_fail)
{
int fd;
struct stat st;
@ -234,13 +231,6 @@ keymgr_submit_file(u_int8_t id, struct kore_domain *dom,
(intmax_t)st.st_size);
}
if (st.st_mtime == *mtime) {
close(fd);
return;
}
*mtime = st.st_mtime;
len = sizeof(*msg) + st.st_size;
payload = kore_calloc(1, len);

2
src/python.c
View File

@ -1484,7 +1484,7 @@ pytimer_run(void *arg, u_int64_t now)
PyErr_Clear();
ret = PyObject_CallObject(timer->callable, NULL);
Py_DECREF(ret);
Py_XDECREF(ret);
if (timer->flags & KORE_TIMER_ONESHOT) {
timer->run = NULL;