Switch to OpenSSL 3.4 and Ubuntu 22.04

docker/Dockerfile

@@ -1,34 +1,34 @@
-FROM ubuntu:xenial AS build-stage
+FROM ubuntu:jammy AS build-stage
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
   apt-get install -y build-essential git cmake autoconf libtool pkg-config \
-  zlib1g-dev libncurses5-dev php7.0-cli wget
+  zlib1g-dev libncurses5-dev php-cli wget
 
 RUN mkdir -p /buildenv/include
 
 WORKDIR /src/buildenv
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1w.tar.gz
-RUN tar xzf openssl-1.1.1w.tar.gz
-RUN cd openssl-1.1.1w && ./config --prefix=/buildenv shared && make -j && make install && cd ..
+RUN wget https://github.com/openssl/openssl/releases/download/openssl-3.4.1/openssl-3.4.1.tar.gz
+RUN tar xzf openssl-3.4.1.tar.gz
+RUN cd openssl-3.4.1 && ./config --prefix=/buildenv --openssldir=/buildenv/usr/ssl --libdir=lib no-tests shared && make -j && make -j install && cd ..
 
 RUN wget https://invisible-mirror.net/archives/dialog/dialog-1.3-20160828.tgz
 RUN tar xzf dialog-1.3-20160828.tgz
 RUN cd dialog-1.3-20160828 && ./configure --disable-widec --prefix=/buildenv && make -j && make install && cp dlg_config.h dialog.h /buildenv/include && cd ..
 
-RUN wget https://dlm.mariadb.com/3677127/Connectors/c/connector-c-3.3.8/mariadb-connector-c-3.3.8-src.tar.gz
-RUN tar xzf mariadb-connector-c-3.3.8-src.tar.gz
-RUN cd mariadb-connector-c-3.3.8-src && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/buildenv .. && make -j && make install && cd ..
+RUN wget https://dlm.mariadb.com/4047871/Connectors/c/connector-c-3.4.4/mariadb-connector-c-3.4.4-src.tar.gz
+RUN tar xzf mariadb-connector-c-3.4.4-src.tar.gz
+RUN cd mariadb-connector-c-3.4.4-src && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/buildenv -DOPENSSL_ROOT_DIR=/buildenv .. && make -j && make install && cd ..
 
 RUN wget http://ftp.cs.stanford.edu/pub/exim/pcre/pcre-8.45.tar.gz
 RUN tar xzf pcre-8.45.tar.gz
 RUN cd pcre-8.45 && ./configure --prefix=/buildenv --enable-shared --disable-static && make -j && make install && cd ..
 
 COPY ./src /src/b1gmailserver
 WORKDIR /src/b1gmailserver/build
-RUN cmake -DCMAKE_INSTALL_PREFIX=/buildenv -DCMAKE_BUILD_TYPE=Release .. && make -j && make dist
+RUN cmake -DCMAKE_INSTALL_PREFIX=/buildenv -DOPENSSL_ROOT_DIR=/buildenv -DCMAKE_BUILD_TYPE=Release .. && make -j && ldd ./b1gmailserver && make dist
 
 FROM scratch AS export-stage
 COPY --from=build-stage /src/b1gmailserver/build/dist/*.run /

src/CMakeLists.txt

@@ -53,7 +53,6 @@ set(SOURCES
 	core/socket.cpp
 	core/sqlite.cpp
 	core/threadpool.cpp
-	core/tls_dh.cpp
 	core/utils.cpp
 	core/win_compat.cpp
 	http/http.cpp

src/buildno

@@ -1 +1 @@
-3306
+3310

src/core/servicesession.cpp

@@ -275,6 +275,10 @@ int ServiceSession::vprintf(const char *str, va_list list)
 #ifndef WIN32
         char *szSSLString = NULL;
         result = vasprintf(&szSSLString, str, list);
+        if (result < 0)
+        {
+            return result;
+        }
 #else
         int result = _vscprintf(str, list);
         char *szSSLString = (char *)malloc(result+1);