From 8782aa046d1f9aa855025c3b0eeea730fe38a77b Mon Sep 17 00:00:00 2001 From: Jordan Bancino Date: Wed, 22 Mar 2023 02:18:31 +0000 Subject: [PATCH] Fix compile error in Tls, work on getting certs and keys into HttpServer. --- src/HttpServer.c | 5 +++-- src/include/Tls.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/HttpServer.c b/src/HttpServer.c index 36ab699..d0cc814 100644 --- a/src/HttpServer.c +++ b/src/HttpServer.c @@ -53,6 +53,8 @@ struct HttpServer unsigned int maxConnections; pthread_t socketThread; int flags; + char *tlsCrt; + char *tlsKey; volatile unsigned int stop:1; volatile unsigned int isRunning:1; @@ -646,8 +648,7 @@ HttpServerEventThread(void *args) #ifdef TLS_IMPL if (server->flags & HTTP_FLAG_TLS) { - /* TODO: Get server cert and key in here */ - fp = TlsServerStream(connFd, NULL, NULL); + fp = TlsServerStream(connFd, server->tlsCrt, server->tlsKey); } else { diff --git a/src/include/Tls.h b/src/include/Tls.h index f408b6a..5b56306 100644 --- a/src/include/Tls.h +++ b/src/include/Tls.h @@ -21,6 +21,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#ifndef TELODENDRIA_TLS_H +#define TELODENDRIA_TLS_H #include