tweaks to use the latest civetweb version + adapt to modern ciphers

Author: kakwa

CMakeLists.txt

@@ -27,7 +27,7 @@ ELSE()
 ENDIF()
 
 IF("$ENV{CIVETWEB_GITTAG}" STREQUAL "")
-    set(CIVETWEB_GITTAG    "v1.11")
+    set(CIVETWEB_GITTAG    "v1.16")
 ELSE()
     set(CIVETWEB_GITTAG    "$ENV{CIVETWEB_GITTAG}")
 ENDIF()
@@ -118,6 +118,7 @@ if(BUNDLE_CIVETWEB)
        PATCH_COMMAND sed -i ${SED_FREEBSD} s/__DATE__/"110973"/ src/main.c src/civetweb.c
        INSTALL_DIR /usr/local
        CMAKE_ARGS .. -DCMAKE_INSTALL_PREFIX=/usr
+        -DCMAKE_INSTALL_LIBDIR=lib
         -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
         -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
         -DCIVETWEB_ENABLE_CXX=OFF
@@ -130,7 +131,7 @@ if(BUNDLE_CIVETWEB)
         -DCIVETWEB_BUILD_TESTING=OFF
         -DCIVETWEB_SSL_OPENSSL_API_1_1=${OPENSSL_API_1_1}
         -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}
-        -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=ON
+        -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF
         -DCIVETWEB_ALLOW_WARNINGS=ON
         ${CIVETWEB_CUST_ARGS}
        INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_SOURCE_DIR}/vendor/

tests/cfg/uts-server-ssl.cnf

@@ -115,7 +115,7 @@ other_policies	= tsa_policy2, tsa_policy3
 
 # Acceptable message digests
 # (mandatory)
-digests		= md5, sha1
+digests		= md5, sha1, sha224, sha256, sha384, sha512
 
 # (optional)
 accuracy	= secs:1, millisecs:500, microsecs:100

tests/external_test.sh

@@ -32,7 +32,7 @@ kill `cat ./uts-server.pid`
 
 sed "s/2020/$PORT/" tests/cfg/uts-server-ssl.cnf >$CFG
 
-sleep 1
+sleep 3
 
 $TO ./uts-server -c $CFG -D -p ./uts-server.pid &