From a25573063f4f6e553109dc036db3b6ed61285699 Mon Sep 17 00:00:00 2001
From: Jordan Bancino <jordan@bancino.net>
Date: Fri, 24 Mar 2023 03:05:12 +0000
Subject: [PATCH] Fix up TlsOpenSSL a little bit.

Server is still broken...
---
 src/Tls/TlsOpenSSL.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Tls/TlsOpenSSL.c b/src/Tls/TlsOpenSSL.c
index de73733..ae21349 100644
--- a/src/Tls/TlsOpenSSL.c
+++ b/src/Tls/TlsOpenSSL.c
@@ -124,32 +124,38 @@ TlsInitServer(int fd, const char *crt, const char *key)
     cookie->ctx = SSL_CTX_new(cookie->method);
     if (!cookie->ctx)
     {
+        Log(LOG_ERR, "TlsServerInit(): Unable to create SSL Context.");
         goto error;
     }
 
     if (SSL_CTX_use_certificate_file(cookie->ctx, crt, SSL_FILETYPE_PEM) <= 0)
     {
+        Log(LOG_ERR, "TlsServerInit(): Unable to set certificate file.");
         goto error;
     }
 
     if (SSL_CTX_use_PrivateKey_file(cookie->ctx, key, SSL_FILETYPE_PEM) <= 0)
     {
+        Log(LOG_ERR, "TlsServerInit(): Unable to set key file.");
         goto error;
     }
 
     cookie->ssl = SSL_new(cookie->ctx);
     if (!cookie->ssl)
     {
+        Log(LOG_ERR, "TlsServerInit(): Unable to create SSL object.");
         goto error;
     }
 
     if (!SSL_set_fd(cookie->ssl, fd))
     {
+        Log(LOG_ERR, "TlsServerInit(): Unable to set file descriptor.");
         goto error;
     }
 
     if (SSL_accept(cookie->ssl) <= 0)
     {
+        Log(LOG_ERR, "TlsServerInit(): Unable to accept connection.");
         goto error;
     }
 
@@ -189,8 +195,12 @@ TlsRead(void *cookie, void *buf, size_t nBytes)
             case SSL_ERROR_WANT_WRITE:
             case SSL_ERROR_WANT_CONNECT:
             case SSL_ERROR_WANT_ACCEPT:
+            case SSL_ERROR_WANT_X509_LOOKUP:
                 errno = EAGAIN;
                 break;
+            case SSL_ERROR_ZERO_RETURN:
+                ret = 0;
+                break;
             default:
                 errno = EIO;
                 break;
@@ -215,8 +225,12 @@ TlsWrite(void *cookie, void *buf, size_t nBytes)
             case SSL_ERROR_WANT_WRITE:
             case SSL_ERROR_WANT_CONNECT:
             case SSL_ERROR_WANT_ACCEPT:
+            case SSL_ERROR_WANT_X509_LOOKUP:
                 errno = EAGAIN;
                 break;
+            case SSL_ERROR_ZERO_RETURN:
+                ret = 0;
+                break;
             default:
                 errno = EIO;
                 break;