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

For each TLS backend let us use correct types.

Browse Source
This commit is contained in:
Joris Vink 2022-02-18 10:47:05 +01:00
parent a9f7bd7faf
commit 80383024a3
5 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -40,6 +40,8 @@ LDFLAGS+=-rdynamic
ifeq ("$(TLS_BACKEND)", "openssl") ifeq ("$(TLS_BACKEND)", "openssl")
S_SRC+=src/keymgr_openssl.c S_SRC+=src/keymgr_openssl.c
CFLAGS+=-DTLS_BACKEND_OPENSSL
FEATURES+=-DTLS_BACKEND_OPENSSL
ifneq ("$(OPENSSL_PATH)", "") ifneq ("$(OPENSSL_PATH)", "")
CFLAGS+=-I$(OPENSSL_PATH)/include CFLAGS+=-I$(OPENSSL_PATH)/include

27
include/kore/kore.h
View File

@ -61,6 +61,20 @@ extern int daemon(int, int);
#define KORE_USE_PLATFORM_PLEDGE 1 #define KORE_USE_PLATFORM_PLEDGE 1
#endif #endif
#if defined(TLS_BACKEND_OPENSSL)
#include <openssl/x509.h>
#include <openssl/ssl.h>
typedef X509 KORE_X509;
typedef SSL KORE_TLS;
typedef SSL_CTX KORE_TLS_CTX;
typedef X509_NAME KORE_X509_NAMES;
#else
typedef void KORE_X509;
typedef void KORE_TLS;
typedef void KORE_TLS_CTX;
typedef void KORE_X509_NAMES;
#endif
#define KORE_RSAKEY_BITS 4096 #define KORE_RSAKEY_BITS 4096
#define KORE_RESULT_ERROR 0 #define KORE_RESULT_ERROR 0
@ -78,7 +92,6 @@ extern int daemon(int, int);
#define errno_s strerror(errno) #define errno_s strerror(errno)
#define ssl_errno_s ERR_error_string(ERR_get_error(), NULL) #define ssl_errno_s ERR_error_string(ERR_get_error(), NULL)
#define KORE_DOMAINNAME_LEN 255 #define KORE_DOMAINNAME_LEN 255
#define KORE_PIDFILE_DEFAULT "kore.pid" #define KORE_PIDFILE_DEFAULT "kore.pid"
#define KORE_DHPARAM_PATH PREFIX "/share/kore/ffdhe4096.pem" #define KORE_DHPARAM_PATH PREFIX "/share/kore/ffdhe4096.pem"
@ -214,8 +227,8 @@ struct connection {
u_int8_t state; u_int8_t state;
u_int8_t proto; u_int8_t proto;
struct listener *owner; struct listener *owner;
void *tls; KORE_TLS *tls;
void *tls_cert; KORE_X509 *tls_cert;
char *tls_sni; char *tls_sni;
int tls_reneg; int tls_reneg;
@ -338,7 +351,7 @@ struct kore_domain {
char *crlfile; char *crlfile;
char *certfile; char *certfile;
char *certkey; char *certkey;
void *ssl_ctx; KORE_TLS_CTX *tls_ctx;
int x509_verify_depth; int x509_verify_depth;
#if !defined(KORE_NO_HTTP) #if !defined(KORE_NO_HTTP)
TAILQ_HEAD(, kore_route) routes; TAILQ_HEAD(, kore_route) routes;
@ -826,9 +839,9 @@ void *kore_tls_rsakey_load(const char *);
void *kore_tls_rsakey_generate(const char *); void *kore_tls_rsakey_generate(const char *);
int kore_tls_x509_data(struct connection *, u_int8_t **, size_t *); int kore_tls_x509_data(struct connection *, u_int8_t **, size_t *);
void *kore_tls_x509_issuer_name(struct connection *); KORE_X509_NAMES *kore_tls_x509_issuer_name(struct connection *);
void *kore_tls_x509_subject_name(struct connection *); KORE_X509_NAMES *kore_tls_x509_subject_name(struct connection *);
int kore_tls_x509name_foreach(void *, int, void *, int kore_tls_x509name_foreach(KORE_X509_NAMES *, int, void *,
int (*)(void *, int, int, const char *, int (*)(void *, int, int, const char *,
const void *, size_t, int)); const void *, size_t, int));
/* accesslog.c */ /* accesslog.c */

2
src/python.c
View File

@ -2935,7 +2935,7 @@ pyconnection_get_peer_x509(struct pyconnection *pyc, void *closure)
static PyObject * static PyObject *
pyconnection_get_peer_x509dict(struct pyconnection *pyc, void *closure) pyconnection_get_peer_x509dict(struct pyconnection *pyc, void *closure)
{ {
void *name; KORE_X509_NAMES *name;
PyObject *dict, *issuer, *subject, *ret; PyObject *dict, *issuer, *subject, *ret;
ret = NULL; ret = NULL;

6
src/tls_openssl.c
View File

@ -651,7 +651,7 @@ kore_tls_rsakey_generate(const char *path)
return (pkey); return (pkey);
} }
void * KORE_X509_NAMES *
kore_tls_x509_subject_name(struct connection *c) kore_tls_x509_subject_name(struct connection *c)
{ {
X509_NAME *name; X509_NAME *name;
@ -662,7 +662,7 @@ kore_tls_x509_subject_name(struct connection *c)
return (name); return (name);
} }
void * KORE_X509_NAMES *
kore_tls_x509_issuer_name(struct connection *c) kore_tls_x509_issuer_name(struct connection *c)
{ {
X509_NAME *name; X509_NAME *name;
@ -674,7 +674,7 @@ kore_tls_x509_issuer_name(struct connection *c)
} }
int int
kore_tls_x509name_foreach(void *name, int flags, void *udata, kore_tls_x509name_foreach(KORE_X509_NAMES *name, int flags, void *udata,
int (*cb)(void *, int, int, const char *, const void *, size_t, int)) int (*cb)(void *, int, int, const char *, const void *, size_t, int))
{ {
u_int8_t *data; u_int8_t *data;

4
src/utils.c
View File

@ -495,7 +495,7 @@ int
kore_x509_issuer_name(struct connection *c, char **out, int flags) kore_x509_issuer_name(struct connection *c, char **out, int flags)
{ {
struct kore_buf buf; struct kore_buf buf;
void *name; KORE_X509_NAMES *name;
if ((name = kore_tls_x509_issuer_name(c)) == NULL) if ((name = kore_tls_x509_issuer_name(c)) == NULL)
return (KORE_RESULT_ERROR); return (KORE_RESULT_ERROR);
@ -520,7 +520,7 @@ int
kore_x509_subject_name(struct connection *c, char **out, int flags) kore_x509_subject_name(struct connection *c, char **out, int flags)
{ {
struct kore_buf buf; struct kore_buf buf;
void *name; KORE_X509_NAMES *name;
if ((name = kore_tls_x509_subject_name(c)) == NULL) if ((name = kore_tls_x509_subject_name(c)) == NULL)
return (KORE_RESULT_ERROR); return (KORE_RESULT_ERROR);