From 8e2d37a73a0ca60cb7485a28070a7010434488ed Mon Sep 17 00:00:00 2001
From: Josh Yelon <jyelon@gmail.com>
Date: Mon, 20 Feb 2023 16:59:10 -0500
Subject: [PATCH] A few changes for mingw port (not done yet)

---
 luprex/Makefile                               | 47 ++++++++++++-------
 luprex/cpp/drv/drvutil.cpp                    | 10 +++-
 luprex/cpp/drv/sslutil.cpp                    | 17 ++++---
 luprex/ext/{openssl-include => openssl}/aes.h |  0
 .../ext/{openssl-include => openssl}/asn1.h   |  0
 .../{openssl-include => openssl}/asn1_mac.h   |  0
 .../{openssl-include => openssl}/asn1err.h    |  0
 .../ext/{openssl-include => openssl}/asn1t.h  |  0
 .../ext/{openssl-include => openssl}/async.h  |  0
 .../{openssl-include => openssl}/asyncerr.h   |  0
 luprex/ext/{openssl-include => openssl}/bio.h |  0
 .../ext/{openssl-include => openssl}/bioerr.h |  0
 .../{openssl-include => openssl}/blowfish.h   |  0
 luprex/ext/{openssl-include => openssl}/bn.h  |  0
 .../ext/{openssl-include => openssl}/bnerr.h  |  0
 .../ext/{openssl-include => openssl}/buffer.h |  0
 .../{openssl-include => openssl}/buffererr.h  |  0
 .../{openssl-include => openssl}/camellia.h   |  0
 .../ext/{openssl-include => openssl}/cast.h   |  0
 .../ext/{openssl-include => openssl}/cmac.h   |  0
 luprex/ext/{openssl-include => openssl}/cmp.h |  0
 .../{openssl-include => openssl}/cmp_util.h   |  0
 .../ext/{openssl-include => openssl}/cmperr.h |  0
 luprex/ext/{openssl-include => openssl}/cms.h |  0
 .../ext/{openssl-include => openssl}/cmserr.h |  0
 .../ext/{openssl-include => openssl}/comp.h   |  0
 .../{openssl-include => openssl}/comperr.h    |  0
 .../ext/{openssl-include => openssl}/conf.h   |  0
 .../{openssl-include => openssl}/conf_api.h   |  0
 .../{openssl-include => openssl}/conferr.h    |  0
 .../configuration.h                           |  0
 .../{openssl-include => openssl}/conftypes.h  |  0
 .../ext/{openssl-include => openssl}/core.h   |  0
 .../core_dispatch.h                           |  0
 .../{openssl-include => openssl}/core_names.h |  0
 .../core_object.h                             |  0
 .../ext/{openssl-include => openssl}/crmf.h   |  0
 .../{openssl-include => openssl}/crmferr.h    |  0
 .../ext/{openssl-include => openssl}/crypto.h |  0
 .../{openssl-include => openssl}/cryptoerr.h  |  0
 .../cryptoerr_legacy.h                        |  0
 luprex/ext/{openssl-include => openssl}/ct.h  |  0
 .../ext/{openssl-include => openssl}/cterr.h  |  0
 .../{openssl-include => openssl}/decoder.h    |  0
 .../{openssl-include => openssl}/decodererr.h |  0
 luprex/ext/{openssl-include => openssl}/des.h |  0
 luprex/ext/{openssl-include => openssl}/dh.h  |  0
 .../ext/{openssl-include => openssl}/dherr.h  |  0
 luprex/ext/{openssl-include => openssl}/dsa.h |  0
 .../ext/{openssl-include => openssl}/dsaerr.h |  0
 .../ext/{openssl-include => openssl}/dtls1.h  |  0
 .../ext/{openssl-include => openssl}/e_os2.h  |  0
 .../ext/{openssl-include => openssl}/ebcdic.h |  0
 luprex/ext/{openssl-include => openssl}/ec.h  |  0
 .../ext/{openssl-include => openssl}/ecdh.h   |  0
 .../ext/{openssl-include => openssl}/ecdsa.h  |  0
 .../ext/{openssl-include => openssl}/ecerr.h  |  0
 .../{openssl-include => openssl}/encoder.h    |  0
 .../{openssl-include => openssl}/encodererr.h |  0
 .../ext/{openssl-include => openssl}/engine.h |  0
 .../{openssl-include => openssl}/engineerr.h  |  0
 luprex/ext/{openssl-include => openssl}/err.h |  0
 luprex/ext/{openssl-include => openssl}/ess.h |  0
 .../ext/{openssl-include => openssl}/esserr.h |  0
 luprex/ext/{openssl-include => openssl}/evp.h |  0
 .../ext/{openssl-include => openssl}/evperr.h |  0
 .../{openssl-include => openssl}/fips_names.h |  0
 .../{openssl-include => openssl}/fipskey.h    |  0
 .../ext/{openssl-include => openssl}/hmac.h   |  0
 .../ext/{openssl-include => openssl}/http.h   |  0
 .../{openssl-include => openssl}/httperr.h    |  0
 .../ext/{openssl-include => openssl}/idea.h   |  0
 luprex/ext/{openssl-include => openssl}/kdf.h |  0
 .../ext/{openssl-include => openssl}/kdferr.h |  0
 .../ext/{openssl-include => openssl}/lhash.h  |  0
 .../ext/{openssl-include => openssl}/macros.h |  0
 luprex/ext/{openssl-include => openssl}/md2.h |  0
 luprex/ext/{openssl-include => openssl}/md4.h |  0
 luprex/ext/{openssl-include => openssl}/md5.h |  0
 .../ext/{openssl-include => openssl}/mdc2.h   |  0
 .../ext/{openssl-include => openssl}/modes.h  |  0
 .../{openssl-include => openssl}/obj_mac.h    |  0
 .../{openssl-include => openssl}/objects.h    |  0
 .../{openssl-include => openssl}/objectserr.h |  0
 .../ext/{openssl-include => openssl}/ocsp.h   |  0
 .../{openssl-include => openssl}/ocsperr.h    |  0
 .../opensslconf.h                             |  0
 .../{openssl-include => openssl}/opensslv.h   |  0
 .../{openssl-include => openssl}/ossl_typ.h   |  0
 .../param_build.h                             |  0
 .../ext/{openssl-include => openssl}/params.h |  0
 luprex/ext/{openssl-include => openssl}/pem.h |  0
 .../ext/{openssl-include => openssl}/pem2.h   |  0
 .../ext/{openssl-include => openssl}/pemerr.h |  0
 .../ext/{openssl-include => openssl}/pkcs12.h |  0
 .../{openssl-include => openssl}/pkcs12err.h  |  0
 .../ext/{openssl-include => openssl}/pkcs7.h  |  0
 .../{openssl-include => openssl}/pkcs7err.h   |  0
 .../{openssl-include => openssl}/prov_ssl.h   |  0
 .../{openssl-include => openssl}/proverr.h    |  0
 .../{openssl-include => openssl}/provider.h   |  0
 .../ext/{openssl-include => openssl}/rand.h   |  0
 .../{openssl-include => openssl}/randerr.h    |  0
 luprex/ext/{openssl-include => openssl}/rc2.h |  0
 luprex/ext/{openssl-include => openssl}/rc4.h |  0
 luprex/ext/{openssl-include => openssl}/rc5.h |  0
 .../ext/{openssl-include => openssl}/ripemd.h |  0
 luprex/ext/{openssl-include => openssl}/rsa.h |  0
 .../ext/{openssl-include => openssl}/rsaerr.h |  0
 .../{openssl-include => openssl}/safestack.h  |  0
 .../ext/{openssl-include => openssl}/seed.h   |  0
 .../{openssl-include => openssl}/self_test.h  |  0
 luprex/ext/{openssl-include => openssl}/sha.h |  0
 luprex/ext/{openssl-include => openssl}/srp.h |  0
 .../ext/{openssl-include => openssl}/srtp.h   |  0
 luprex/ext/{openssl-include => openssl}/ssl.h |  0
 .../ext/{openssl-include => openssl}/ssl2.h   |  0
 .../ext/{openssl-include => openssl}/ssl3.h   |  0
 .../ext/{openssl-include => openssl}/sslerr.h |  0
 .../sslerr_legacy.h                           |  0
 .../ext/{openssl-include => openssl}/stack.h  |  0
 .../ext/{openssl-include => openssl}/store.h  |  0
 .../{openssl-include => openssl}/storeerr.h   |  0
 .../{openssl-include => openssl}/symhacks.h   |  0
 .../ext/{openssl-include => openssl}/tls1.h   |  0
 .../ext/{openssl-include => openssl}/trace.h  |  0
 luprex/ext/{openssl-include => openssl}/ts.h  |  0
 .../ext/{openssl-include => openssl}/tserr.h  |  0
 .../ext/{openssl-include => openssl}/txt_db.h |  0
 .../ext/{openssl-include => openssl}/types.h  |  0
 luprex/ext/{openssl-include => openssl}/ui.h  |  0
 .../ext/{openssl-include => openssl}/uierr.h  |  0
 .../{openssl-include => openssl}/whrlpool.h   |  0
 .../ext/{openssl-include => openssl}/x509.h   |  0
 .../{openssl-include => openssl}/x509_vfy.h   |  0
 .../{openssl-include => openssl}/x509err.h    |  0
 .../ext/{openssl-include => openssl}/x509v3.h |  0
 .../{openssl-include => openssl}/x509v3err.h  |  0
 138 files changed, 49 insertions(+), 25 deletions(-)
 rename luprex/ext/{openssl-include => openssl}/aes.h (100%)
 rename luprex/ext/{openssl-include => openssl}/asn1.h (100%)
 rename luprex/ext/{openssl-include => openssl}/asn1_mac.h (100%)
 rename luprex/ext/{openssl-include => openssl}/asn1err.h (100%)
 rename luprex/ext/{openssl-include => openssl}/asn1t.h (100%)
 rename luprex/ext/{openssl-include => openssl}/async.h (100%)
 rename luprex/ext/{openssl-include => openssl}/asyncerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/bio.h (100%)
 rename luprex/ext/{openssl-include => openssl}/bioerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/blowfish.h (100%)
 rename luprex/ext/{openssl-include => openssl}/bn.h (100%)
 rename luprex/ext/{openssl-include => openssl}/bnerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/buffer.h (100%)
 rename luprex/ext/{openssl-include => openssl}/buffererr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/camellia.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cast.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cmac.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cmp.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cmp_util.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cmperr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cms.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cmserr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/comp.h (100%)
 rename luprex/ext/{openssl-include => openssl}/comperr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/conf.h (100%)
 rename luprex/ext/{openssl-include => openssl}/conf_api.h (100%)
 rename luprex/ext/{openssl-include => openssl}/conferr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/configuration.h (100%)
 rename luprex/ext/{openssl-include => openssl}/conftypes.h (100%)
 rename luprex/ext/{openssl-include => openssl}/core.h (100%)
 rename luprex/ext/{openssl-include => openssl}/core_dispatch.h (100%)
 rename luprex/ext/{openssl-include => openssl}/core_names.h (100%)
 rename luprex/ext/{openssl-include => openssl}/core_object.h (100%)
 rename luprex/ext/{openssl-include => openssl}/crmf.h (100%)
 rename luprex/ext/{openssl-include => openssl}/crmferr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/crypto.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cryptoerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cryptoerr_legacy.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ct.h (100%)
 rename luprex/ext/{openssl-include => openssl}/cterr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/decoder.h (100%)
 rename luprex/ext/{openssl-include => openssl}/decodererr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/des.h (100%)
 rename luprex/ext/{openssl-include => openssl}/dh.h (100%)
 rename luprex/ext/{openssl-include => openssl}/dherr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/dsa.h (100%)
 rename luprex/ext/{openssl-include => openssl}/dsaerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/dtls1.h (100%)
 rename luprex/ext/{openssl-include => openssl}/e_os2.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ebcdic.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ec.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ecdh.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ecdsa.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ecerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/encoder.h (100%)
 rename luprex/ext/{openssl-include => openssl}/encodererr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/engine.h (100%)
 rename luprex/ext/{openssl-include => openssl}/engineerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/err.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ess.h (100%)
 rename luprex/ext/{openssl-include => openssl}/esserr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/evp.h (100%)
 rename luprex/ext/{openssl-include => openssl}/evperr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/fips_names.h (100%)
 rename luprex/ext/{openssl-include => openssl}/fipskey.h (100%)
 rename luprex/ext/{openssl-include => openssl}/hmac.h (100%)
 rename luprex/ext/{openssl-include => openssl}/http.h (100%)
 rename luprex/ext/{openssl-include => openssl}/httperr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/idea.h (100%)
 rename luprex/ext/{openssl-include => openssl}/kdf.h (100%)
 rename luprex/ext/{openssl-include => openssl}/kdferr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/lhash.h (100%)
 rename luprex/ext/{openssl-include => openssl}/macros.h (100%)
 rename luprex/ext/{openssl-include => openssl}/md2.h (100%)
 rename luprex/ext/{openssl-include => openssl}/md4.h (100%)
 rename luprex/ext/{openssl-include => openssl}/md5.h (100%)
 rename luprex/ext/{openssl-include => openssl}/mdc2.h (100%)
 rename luprex/ext/{openssl-include => openssl}/modes.h (100%)
 rename luprex/ext/{openssl-include => openssl}/obj_mac.h (100%)
 rename luprex/ext/{openssl-include => openssl}/objects.h (100%)
 rename luprex/ext/{openssl-include => openssl}/objectserr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ocsp.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ocsperr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/opensslconf.h (100%)
 rename luprex/ext/{openssl-include => openssl}/opensslv.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ossl_typ.h (100%)
 rename luprex/ext/{openssl-include => openssl}/param_build.h (100%)
 rename luprex/ext/{openssl-include => openssl}/params.h (100%)
 rename luprex/ext/{openssl-include => openssl}/pem.h (100%)
 rename luprex/ext/{openssl-include => openssl}/pem2.h (100%)
 rename luprex/ext/{openssl-include => openssl}/pemerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/pkcs12.h (100%)
 rename luprex/ext/{openssl-include => openssl}/pkcs12err.h (100%)
 rename luprex/ext/{openssl-include => openssl}/pkcs7.h (100%)
 rename luprex/ext/{openssl-include => openssl}/pkcs7err.h (100%)
 rename luprex/ext/{openssl-include => openssl}/prov_ssl.h (100%)
 rename luprex/ext/{openssl-include => openssl}/proverr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/provider.h (100%)
 rename luprex/ext/{openssl-include => openssl}/rand.h (100%)
 rename luprex/ext/{openssl-include => openssl}/randerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/rc2.h (100%)
 rename luprex/ext/{openssl-include => openssl}/rc4.h (100%)
 rename luprex/ext/{openssl-include => openssl}/rc5.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ripemd.h (100%)
 rename luprex/ext/{openssl-include => openssl}/rsa.h (100%)
 rename luprex/ext/{openssl-include => openssl}/rsaerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/safestack.h (100%)
 rename luprex/ext/{openssl-include => openssl}/seed.h (100%)
 rename luprex/ext/{openssl-include => openssl}/self_test.h (100%)
 rename luprex/ext/{openssl-include => openssl}/sha.h (100%)
 rename luprex/ext/{openssl-include => openssl}/srp.h (100%)
 rename luprex/ext/{openssl-include => openssl}/srtp.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ssl.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ssl2.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ssl3.h (100%)
 rename luprex/ext/{openssl-include => openssl}/sslerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/sslerr_legacy.h (100%)
 rename luprex/ext/{openssl-include => openssl}/stack.h (100%)
 rename luprex/ext/{openssl-include => openssl}/store.h (100%)
 rename luprex/ext/{openssl-include => openssl}/storeerr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/symhacks.h (100%)
 rename luprex/ext/{openssl-include => openssl}/tls1.h (100%)
 rename luprex/ext/{openssl-include => openssl}/trace.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ts.h (100%)
 rename luprex/ext/{openssl-include => openssl}/tserr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/txt_db.h (100%)
 rename luprex/ext/{openssl-include => openssl}/types.h (100%)
 rename luprex/ext/{openssl-include => openssl}/ui.h (100%)
 rename luprex/ext/{openssl-include => openssl}/uierr.h (100%)
 rename luprex/ext/{openssl-include => openssl}/whrlpool.h (100%)
 rename luprex/ext/{openssl-include => openssl}/x509.h (100%)
 rename luprex/ext/{openssl-include => openssl}/x509_vfy.h (100%)
 rename luprex/ext/{openssl-include => openssl}/x509err.h (100%)
 rename luprex/ext/{openssl-include => openssl}/x509v3.h (100%)
 rename luprex/ext/{openssl-include => openssl}/x509v3err.h (100%)

diff --git a/luprex/Makefile b/luprex/Makefile
index fe079efa..eb651ae0 100644
--- a/luprex/Makefile
+++ b/luprex/Makefile
@@ -1,4 +1,27 @@
 
+ifeq ($(OS),mingw)
+  EXE=main.exe
+  LIBS=-L./ext/openssl-mingw -lssl -lcrypto -lws2_32 -lcrypt32 -lcryptui
+  LUAFLAGS=-DLUA_USE_APICHECK -DLUA_COMPAT_ALL
+  OPT=-g -O0
+  DRIVER=driver-mingw
+else ifeq ($(OS),linux)
+  EXE=main
+  LIBS=-L./ext/openssl-linux -lssl -lcrypto
+  LUAFLAGS=-DLUA_USE_APICHECK -DLUA_USE_POSIX
+  OPT=-g -O0
+  DRIVER=driver-linux
+else
+  # In this case, any attempt to build luprex will trigger an error,
+  # But making 'clean' will still work.
+  ERROR=$(error You must specify OS=linux or OS=mingw)
+  EXE=$(ERROR)
+  LIBS=$(ERROR)
+  LUAFLAGS=$(ERROR)
+  OPT=$(ERROR)
+  DRIVER=driver-xxx
+endif
+
 
 OBJ_ERIS=\
 	obj/eris/lapi.o \
@@ -35,7 +58,6 @@ OBJ_ERIS=\
 	obj/eris/linit.o \
 	obj/eris/eris.o \
 
-
 OBJ_CORE=\
 	obj/core/invocation.o\
 	obj/core/spookyv2.o\
@@ -71,37 +93,28 @@ OBJ_CORE=\
 	obj/core/eng-tests.o\
 	obj/core/printbuffer.o\
 
-
 OBJ_DRV=\
 	obj/drv/drvutil.o\
 	obj/drv/sslutil.o\
+	obj/drv/$(DRIVER).o
 
 
-ifeq ($(OS),linux)
 
-OPT=-g -O0
-
-main: $(OBJ_DRV) $(OBJ_CORE) $(OBJ_ERIS) obj/drv/driver-linux.o
-	g++ $(OPT) -std=c++17 -export-dynamic -Wall -o $@ $(OBJ_DRV) $(OBJ_CORE) $(OBJ_ERIS) obj/drv/driver-linux.o -L./ext/openssl-linux -lssl -lcrypto -ldl
+$(EXE): $(OBJ_ERIS) $(OBJ_CORE) $(OBJ_DRV)
+	g++ $(OPT) -std=c++17 -export-dynamic -Wall -o $@ $(OBJ_ERIS) $(OBJ_CORE) $(OBJ_DRV) $(LIBS)
 
 obj/eris/%.o: ext/eris-master/src/%.c
-	gcc $(OPT) -Wall -fvisibility=hidden -DLUA_USE_APICHECK -DLUA_USE_POSIX -c -MMD $< -o $@
+	gcc $(OPT) -Wall -fvisibility=hidden $(LUAFLAGS) -c -MMD $< -o $@
 
 obj/core/%.o: cpp/core/%.cpp
 	g++ $(OPT) -Wall -fvisibility=hidden -std=c++17 -I./ext/eris-master/src -I./cpp/wrap -I./cpp/core -c -MMD $< -o $@
 
 obj/drv/%.o: cpp/drv/%.cpp
-	g++ $(OPT) -Wall -fvisibility=hidden -std=c++17 -I./ext/openssl -I./src/drv -c -MMD $< -o $@
-
--include obj/drv/driver-linux.d
-
-endif
+	g++ $(OPT) -Wall -fvisibility=hidden -std=c++17 -I./ext -I./src/drv -c -MMD $< -o $@
 
 clean:
-	rm -f main.exe main obj/*/*.*
+	rm -f main.exe main obj/core/*.* obj/drv/*.* obj/eris/*.*
 
 -include $(OBJ_ERIS:%.o=%.d)
--include $(OBJ_CORE:%.o=%.d)
--include $(OBJ_DRV:%.o=%.d)
-
+-include $(OBJ_ERIS:%.o=%.d)
 
diff --git a/luprex/cpp/drv/drvutil.cpp b/luprex/cpp/drv/drvutil.cpp
index 3b56abd7..9b642328 100644
--- a/luprex/cpp/drv/drvutil.cpp
+++ b/luprex/cpp/drv/drvutil.cpp
@@ -9,6 +9,12 @@
 #include <string.h>
 #include <iostream>
 
+#if defined(_WIN32)
+#include <profileapi.h>
+#elif defined(__linux__)
+#include <time.h>
+#endif
+
 namespace drvutil {
 
 
@@ -198,7 +204,7 @@ void strerror_safe(int errnum, char errbuf[256]) {
     if (status != 0) {
         snprintf(errbuf, 256, "unknown errno %d", errnum);
     }
-);
+}
 
 #endif
 
@@ -252,7 +258,7 @@ std::string strerror_str(int errnum) {
             base_ = qpc();
         }
         double get() {
-            return (qpc() - base) * freq_;
+            return (qpc() - base_) * freq_;
         }
     };
 
diff --git a/luprex/cpp/drv/sslutil.cpp b/luprex/cpp/drv/sslutil.cpp
index a60a5ca4..1cdd3072 100644
--- a/luprex/cpp/drv/sslutil.cpp
+++ b/luprex/cpp/drv/sslutil.cpp
@@ -87,12 +87,17 @@ std::string error_string() {
     }
 }
 
-std::string path_to_plain_ascii(const std::filesystem::path &path) {
-	std::string s = path.native();
-	for (char c : s) {
-		if ((c < 1) || (c > 127)) return "";
+// Make sure the path only contains printable ascii characters,
+// and no control characters or unicode characters.
+std::string path_to_plain_printable_ascii(const std::filesystem::path &path) {
+	auto s = path.native();
+    std::string result(' ', s.size());
+    for (int i = 0; i < int(s.size()); i++) {
+        auto c = s[i];
+        if ((c < 32) || (c > 126)) return "";
+        result[i] = c;
 	}
-	return s;
+	return result;
 }
 
 void clear_all_errors() {
@@ -170,7 +175,7 @@ void ctx_load_cert_from_directory(SSL_CTX *ctx, const std::string &dir) {
     std::vector<std::string> cert_paths;
 
     for (const auto & entry : std::filesystem::directory_iterator(dir)) {
-		std::string fn = path_to_plain_ascii(entry.path());
+		std::string fn = path_to_plain_printable_ascii(entry.path());
 		if (fn.empty()) {
 			std::cerr << "Ignoring file with non-ascii filename: " << entry.path() << std::endl;
 		} else {
diff --git a/luprex/ext/openssl-include/aes.h b/luprex/ext/openssl/aes.h
similarity index 100%
rename from luprex/ext/openssl-include/aes.h
rename to luprex/ext/openssl/aes.h
diff --git a/luprex/ext/openssl-include/asn1.h b/luprex/ext/openssl/asn1.h
similarity index 100%
rename from luprex/ext/openssl-include/asn1.h
rename to luprex/ext/openssl/asn1.h
diff --git a/luprex/ext/openssl-include/asn1_mac.h b/luprex/ext/openssl/asn1_mac.h
similarity index 100%
rename from luprex/ext/openssl-include/asn1_mac.h
rename to luprex/ext/openssl/asn1_mac.h
diff --git a/luprex/ext/openssl-include/asn1err.h b/luprex/ext/openssl/asn1err.h
similarity index 100%
rename from luprex/ext/openssl-include/asn1err.h
rename to luprex/ext/openssl/asn1err.h
diff --git a/luprex/ext/openssl-include/asn1t.h b/luprex/ext/openssl/asn1t.h
similarity index 100%
rename from luprex/ext/openssl-include/asn1t.h
rename to luprex/ext/openssl/asn1t.h
diff --git a/luprex/ext/openssl-include/async.h b/luprex/ext/openssl/async.h
similarity index 100%
rename from luprex/ext/openssl-include/async.h
rename to luprex/ext/openssl/async.h
diff --git a/luprex/ext/openssl-include/asyncerr.h b/luprex/ext/openssl/asyncerr.h
similarity index 100%
rename from luprex/ext/openssl-include/asyncerr.h
rename to luprex/ext/openssl/asyncerr.h
diff --git a/luprex/ext/openssl-include/bio.h b/luprex/ext/openssl/bio.h
similarity index 100%
rename from luprex/ext/openssl-include/bio.h
rename to luprex/ext/openssl/bio.h
diff --git a/luprex/ext/openssl-include/bioerr.h b/luprex/ext/openssl/bioerr.h
similarity index 100%
rename from luprex/ext/openssl-include/bioerr.h
rename to luprex/ext/openssl/bioerr.h
diff --git a/luprex/ext/openssl-include/blowfish.h b/luprex/ext/openssl/blowfish.h
similarity index 100%
rename from luprex/ext/openssl-include/blowfish.h
rename to luprex/ext/openssl/blowfish.h
diff --git a/luprex/ext/openssl-include/bn.h b/luprex/ext/openssl/bn.h
similarity index 100%
rename from luprex/ext/openssl-include/bn.h
rename to luprex/ext/openssl/bn.h
diff --git a/luprex/ext/openssl-include/bnerr.h b/luprex/ext/openssl/bnerr.h
similarity index 100%
rename from luprex/ext/openssl-include/bnerr.h
rename to luprex/ext/openssl/bnerr.h
diff --git a/luprex/ext/openssl-include/buffer.h b/luprex/ext/openssl/buffer.h
similarity index 100%
rename from luprex/ext/openssl-include/buffer.h
rename to luprex/ext/openssl/buffer.h
diff --git a/luprex/ext/openssl-include/buffererr.h b/luprex/ext/openssl/buffererr.h
similarity index 100%
rename from luprex/ext/openssl-include/buffererr.h
rename to luprex/ext/openssl/buffererr.h
diff --git a/luprex/ext/openssl-include/camellia.h b/luprex/ext/openssl/camellia.h
similarity index 100%
rename from luprex/ext/openssl-include/camellia.h
rename to luprex/ext/openssl/camellia.h
diff --git a/luprex/ext/openssl-include/cast.h b/luprex/ext/openssl/cast.h
similarity index 100%
rename from luprex/ext/openssl-include/cast.h
rename to luprex/ext/openssl/cast.h
diff --git a/luprex/ext/openssl-include/cmac.h b/luprex/ext/openssl/cmac.h
similarity index 100%
rename from luprex/ext/openssl-include/cmac.h
rename to luprex/ext/openssl/cmac.h
diff --git a/luprex/ext/openssl-include/cmp.h b/luprex/ext/openssl/cmp.h
similarity index 100%
rename from luprex/ext/openssl-include/cmp.h
rename to luprex/ext/openssl/cmp.h
diff --git a/luprex/ext/openssl-include/cmp_util.h b/luprex/ext/openssl/cmp_util.h
similarity index 100%
rename from luprex/ext/openssl-include/cmp_util.h
rename to luprex/ext/openssl/cmp_util.h
diff --git a/luprex/ext/openssl-include/cmperr.h b/luprex/ext/openssl/cmperr.h
similarity index 100%
rename from luprex/ext/openssl-include/cmperr.h
rename to luprex/ext/openssl/cmperr.h
diff --git a/luprex/ext/openssl-include/cms.h b/luprex/ext/openssl/cms.h
similarity index 100%
rename from luprex/ext/openssl-include/cms.h
rename to luprex/ext/openssl/cms.h
diff --git a/luprex/ext/openssl-include/cmserr.h b/luprex/ext/openssl/cmserr.h
similarity index 100%
rename from luprex/ext/openssl-include/cmserr.h
rename to luprex/ext/openssl/cmserr.h
diff --git a/luprex/ext/openssl-include/comp.h b/luprex/ext/openssl/comp.h
similarity index 100%
rename from luprex/ext/openssl-include/comp.h
rename to luprex/ext/openssl/comp.h
diff --git a/luprex/ext/openssl-include/comperr.h b/luprex/ext/openssl/comperr.h
similarity index 100%
rename from luprex/ext/openssl-include/comperr.h
rename to luprex/ext/openssl/comperr.h
diff --git a/luprex/ext/openssl-include/conf.h b/luprex/ext/openssl/conf.h
similarity index 100%
rename from luprex/ext/openssl-include/conf.h
rename to luprex/ext/openssl/conf.h
diff --git a/luprex/ext/openssl-include/conf_api.h b/luprex/ext/openssl/conf_api.h
similarity index 100%
rename from luprex/ext/openssl-include/conf_api.h
rename to luprex/ext/openssl/conf_api.h
diff --git a/luprex/ext/openssl-include/conferr.h b/luprex/ext/openssl/conferr.h
similarity index 100%
rename from luprex/ext/openssl-include/conferr.h
rename to luprex/ext/openssl/conferr.h
diff --git a/luprex/ext/openssl-include/configuration.h b/luprex/ext/openssl/configuration.h
similarity index 100%
rename from luprex/ext/openssl-include/configuration.h
rename to luprex/ext/openssl/configuration.h
diff --git a/luprex/ext/openssl-include/conftypes.h b/luprex/ext/openssl/conftypes.h
similarity index 100%
rename from luprex/ext/openssl-include/conftypes.h
rename to luprex/ext/openssl/conftypes.h
diff --git a/luprex/ext/openssl-include/core.h b/luprex/ext/openssl/core.h
similarity index 100%
rename from luprex/ext/openssl-include/core.h
rename to luprex/ext/openssl/core.h
diff --git a/luprex/ext/openssl-include/core_dispatch.h b/luprex/ext/openssl/core_dispatch.h
similarity index 100%
rename from luprex/ext/openssl-include/core_dispatch.h
rename to luprex/ext/openssl/core_dispatch.h
diff --git a/luprex/ext/openssl-include/core_names.h b/luprex/ext/openssl/core_names.h
similarity index 100%
rename from luprex/ext/openssl-include/core_names.h
rename to luprex/ext/openssl/core_names.h
diff --git a/luprex/ext/openssl-include/core_object.h b/luprex/ext/openssl/core_object.h
similarity index 100%
rename from luprex/ext/openssl-include/core_object.h
rename to luprex/ext/openssl/core_object.h
diff --git a/luprex/ext/openssl-include/crmf.h b/luprex/ext/openssl/crmf.h
similarity index 100%
rename from luprex/ext/openssl-include/crmf.h
rename to luprex/ext/openssl/crmf.h
diff --git a/luprex/ext/openssl-include/crmferr.h b/luprex/ext/openssl/crmferr.h
similarity index 100%
rename from luprex/ext/openssl-include/crmferr.h
rename to luprex/ext/openssl/crmferr.h
diff --git a/luprex/ext/openssl-include/crypto.h b/luprex/ext/openssl/crypto.h
similarity index 100%
rename from luprex/ext/openssl-include/crypto.h
rename to luprex/ext/openssl/crypto.h
diff --git a/luprex/ext/openssl-include/cryptoerr.h b/luprex/ext/openssl/cryptoerr.h
similarity index 100%
rename from luprex/ext/openssl-include/cryptoerr.h
rename to luprex/ext/openssl/cryptoerr.h
diff --git a/luprex/ext/openssl-include/cryptoerr_legacy.h b/luprex/ext/openssl/cryptoerr_legacy.h
similarity index 100%
rename from luprex/ext/openssl-include/cryptoerr_legacy.h
rename to luprex/ext/openssl/cryptoerr_legacy.h
diff --git a/luprex/ext/openssl-include/ct.h b/luprex/ext/openssl/ct.h
similarity index 100%
rename from luprex/ext/openssl-include/ct.h
rename to luprex/ext/openssl/ct.h
diff --git a/luprex/ext/openssl-include/cterr.h b/luprex/ext/openssl/cterr.h
similarity index 100%
rename from luprex/ext/openssl-include/cterr.h
rename to luprex/ext/openssl/cterr.h
diff --git a/luprex/ext/openssl-include/decoder.h b/luprex/ext/openssl/decoder.h
similarity index 100%
rename from luprex/ext/openssl-include/decoder.h
rename to luprex/ext/openssl/decoder.h
diff --git a/luprex/ext/openssl-include/decodererr.h b/luprex/ext/openssl/decodererr.h
similarity index 100%
rename from luprex/ext/openssl-include/decodererr.h
rename to luprex/ext/openssl/decodererr.h
diff --git a/luprex/ext/openssl-include/des.h b/luprex/ext/openssl/des.h
similarity index 100%
rename from luprex/ext/openssl-include/des.h
rename to luprex/ext/openssl/des.h
diff --git a/luprex/ext/openssl-include/dh.h b/luprex/ext/openssl/dh.h
similarity index 100%
rename from luprex/ext/openssl-include/dh.h
rename to luprex/ext/openssl/dh.h
diff --git a/luprex/ext/openssl-include/dherr.h b/luprex/ext/openssl/dherr.h
similarity index 100%
rename from luprex/ext/openssl-include/dherr.h
rename to luprex/ext/openssl/dherr.h
diff --git a/luprex/ext/openssl-include/dsa.h b/luprex/ext/openssl/dsa.h
similarity index 100%
rename from luprex/ext/openssl-include/dsa.h
rename to luprex/ext/openssl/dsa.h
diff --git a/luprex/ext/openssl-include/dsaerr.h b/luprex/ext/openssl/dsaerr.h
similarity index 100%
rename from luprex/ext/openssl-include/dsaerr.h
rename to luprex/ext/openssl/dsaerr.h
diff --git a/luprex/ext/openssl-include/dtls1.h b/luprex/ext/openssl/dtls1.h
similarity index 100%
rename from luprex/ext/openssl-include/dtls1.h
rename to luprex/ext/openssl/dtls1.h
diff --git a/luprex/ext/openssl-include/e_os2.h b/luprex/ext/openssl/e_os2.h
similarity index 100%
rename from luprex/ext/openssl-include/e_os2.h
rename to luprex/ext/openssl/e_os2.h
diff --git a/luprex/ext/openssl-include/ebcdic.h b/luprex/ext/openssl/ebcdic.h
similarity index 100%
rename from luprex/ext/openssl-include/ebcdic.h
rename to luprex/ext/openssl/ebcdic.h
diff --git a/luprex/ext/openssl-include/ec.h b/luprex/ext/openssl/ec.h
similarity index 100%
rename from luprex/ext/openssl-include/ec.h
rename to luprex/ext/openssl/ec.h
diff --git a/luprex/ext/openssl-include/ecdh.h b/luprex/ext/openssl/ecdh.h
similarity index 100%
rename from luprex/ext/openssl-include/ecdh.h
rename to luprex/ext/openssl/ecdh.h
diff --git a/luprex/ext/openssl-include/ecdsa.h b/luprex/ext/openssl/ecdsa.h
similarity index 100%
rename from luprex/ext/openssl-include/ecdsa.h
rename to luprex/ext/openssl/ecdsa.h
diff --git a/luprex/ext/openssl-include/ecerr.h b/luprex/ext/openssl/ecerr.h
similarity index 100%
rename from luprex/ext/openssl-include/ecerr.h
rename to luprex/ext/openssl/ecerr.h
diff --git a/luprex/ext/openssl-include/encoder.h b/luprex/ext/openssl/encoder.h
similarity index 100%
rename from luprex/ext/openssl-include/encoder.h
rename to luprex/ext/openssl/encoder.h
diff --git a/luprex/ext/openssl-include/encodererr.h b/luprex/ext/openssl/encodererr.h
similarity index 100%
rename from luprex/ext/openssl-include/encodererr.h
rename to luprex/ext/openssl/encodererr.h
diff --git a/luprex/ext/openssl-include/engine.h b/luprex/ext/openssl/engine.h
similarity index 100%
rename from luprex/ext/openssl-include/engine.h
rename to luprex/ext/openssl/engine.h
diff --git a/luprex/ext/openssl-include/engineerr.h b/luprex/ext/openssl/engineerr.h
similarity index 100%
rename from luprex/ext/openssl-include/engineerr.h
rename to luprex/ext/openssl/engineerr.h
diff --git a/luprex/ext/openssl-include/err.h b/luprex/ext/openssl/err.h
similarity index 100%
rename from luprex/ext/openssl-include/err.h
rename to luprex/ext/openssl/err.h
diff --git a/luprex/ext/openssl-include/ess.h b/luprex/ext/openssl/ess.h
similarity index 100%
rename from luprex/ext/openssl-include/ess.h
rename to luprex/ext/openssl/ess.h
diff --git a/luprex/ext/openssl-include/esserr.h b/luprex/ext/openssl/esserr.h
similarity index 100%
rename from luprex/ext/openssl-include/esserr.h
rename to luprex/ext/openssl/esserr.h
diff --git a/luprex/ext/openssl-include/evp.h b/luprex/ext/openssl/evp.h
similarity index 100%
rename from luprex/ext/openssl-include/evp.h
rename to luprex/ext/openssl/evp.h
diff --git a/luprex/ext/openssl-include/evperr.h b/luprex/ext/openssl/evperr.h
similarity index 100%
rename from luprex/ext/openssl-include/evperr.h
rename to luprex/ext/openssl/evperr.h
diff --git a/luprex/ext/openssl-include/fips_names.h b/luprex/ext/openssl/fips_names.h
similarity index 100%
rename from luprex/ext/openssl-include/fips_names.h
rename to luprex/ext/openssl/fips_names.h
diff --git a/luprex/ext/openssl-include/fipskey.h b/luprex/ext/openssl/fipskey.h
similarity index 100%
rename from luprex/ext/openssl-include/fipskey.h
rename to luprex/ext/openssl/fipskey.h
diff --git a/luprex/ext/openssl-include/hmac.h b/luprex/ext/openssl/hmac.h
similarity index 100%
rename from luprex/ext/openssl-include/hmac.h
rename to luprex/ext/openssl/hmac.h
diff --git a/luprex/ext/openssl-include/http.h b/luprex/ext/openssl/http.h
similarity index 100%
rename from luprex/ext/openssl-include/http.h
rename to luprex/ext/openssl/http.h
diff --git a/luprex/ext/openssl-include/httperr.h b/luprex/ext/openssl/httperr.h
similarity index 100%
rename from luprex/ext/openssl-include/httperr.h
rename to luprex/ext/openssl/httperr.h
diff --git a/luprex/ext/openssl-include/idea.h b/luprex/ext/openssl/idea.h
similarity index 100%
rename from luprex/ext/openssl-include/idea.h
rename to luprex/ext/openssl/idea.h
diff --git a/luprex/ext/openssl-include/kdf.h b/luprex/ext/openssl/kdf.h
similarity index 100%
rename from luprex/ext/openssl-include/kdf.h
rename to luprex/ext/openssl/kdf.h
diff --git a/luprex/ext/openssl-include/kdferr.h b/luprex/ext/openssl/kdferr.h
similarity index 100%
rename from luprex/ext/openssl-include/kdferr.h
rename to luprex/ext/openssl/kdferr.h
diff --git a/luprex/ext/openssl-include/lhash.h b/luprex/ext/openssl/lhash.h
similarity index 100%
rename from luprex/ext/openssl-include/lhash.h
rename to luprex/ext/openssl/lhash.h
diff --git a/luprex/ext/openssl-include/macros.h b/luprex/ext/openssl/macros.h
similarity index 100%
rename from luprex/ext/openssl-include/macros.h
rename to luprex/ext/openssl/macros.h
diff --git a/luprex/ext/openssl-include/md2.h b/luprex/ext/openssl/md2.h
similarity index 100%
rename from luprex/ext/openssl-include/md2.h
rename to luprex/ext/openssl/md2.h
diff --git a/luprex/ext/openssl-include/md4.h b/luprex/ext/openssl/md4.h
similarity index 100%
rename from luprex/ext/openssl-include/md4.h
rename to luprex/ext/openssl/md4.h
diff --git a/luprex/ext/openssl-include/md5.h b/luprex/ext/openssl/md5.h
similarity index 100%
rename from luprex/ext/openssl-include/md5.h
rename to luprex/ext/openssl/md5.h
diff --git a/luprex/ext/openssl-include/mdc2.h b/luprex/ext/openssl/mdc2.h
similarity index 100%
rename from luprex/ext/openssl-include/mdc2.h
rename to luprex/ext/openssl/mdc2.h
diff --git a/luprex/ext/openssl-include/modes.h b/luprex/ext/openssl/modes.h
similarity index 100%
rename from luprex/ext/openssl-include/modes.h
rename to luprex/ext/openssl/modes.h
diff --git a/luprex/ext/openssl-include/obj_mac.h b/luprex/ext/openssl/obj_mac.h
similarity index 100%
rename from luprex/ext/openssl-include/obj_mac.h
rename to luprex/ext/openssl/obj_mac.h
diff --git a/luprex/ext/openssl-include/objects.h b/luprex/ext/openssl/objects.h
similarity index 100%
rename from luprex/ext/openssl-include/objects.h
rename to luprex/ext/openssl/objects.h
diff --git a/luprex/ext/openssl-include/objectserr.h b/luprex/ext/openssl/objectserr.h
similarity index 100%
rename from luprex/ext/openssl-include/objectserr.h
rename to luprex/ext/openssl/objectserr.h
diff --git a/luprex/ext/openssl-include/ocsp.h b/luprex/ext/openssl/ocsp.h
similarity index 100%
rename from luprex/ext/openssl-include/ocsp.h
rename to luprex/ext/openssl/ocsp.h
diff --git a/luprex/ext/openssl-include/ocsperr.h b/luprex/ext/openssl/ocsperr.h
similarity index 100%
rename from luprex/ext/openssl-include/ocsperr.h
rename to luprex/ext/openssl/ocsperr.h
diff --git a/luprex/ext/openssl-include/opensslconf.h b/luprex/ext/openssl/opensslconf.h
similarity index 100%
rename from luprex/ext/openssl-include/opensslconf.h
rename to luprex/ext/openssl/opensslconf.h
diff --git a/luprex/ext/openssl-include/opensslv.h b/luprex/ext/openssl/opensslv.h
similarity index 100%
rename from luprex/ext/openssl-include/opensslv.h
rename to luprex/ext/openssl/opensslv.h
diff --git a/luprex/ext/openssl-include/ossl_typ.h b/luprex/ext/openssl/ossl_typ.h
similarity index 100%
rename from luprex/ext/openssl-include/ossl_typ.h
rename to luprex/ext/openssl/ossl_typ.h
diff --git a/luprex/ext/openssl-include/param_build.h b/luprex/ext/openssl/param_build.h
similarity index 100%
rename from luprex/ext/openssl-include/param_build.h
rename to luprex/ext/openssl/param_build.h
diff --git a/luprex/ext/openssl-include/params.h b/luprex/ext/openssl/params.h
similarity index 100%
rename from luprex/ext/openssl-include/params.h
rename to luprex/ext/openssl/params.h
diff --git a/luprex/ext/openssl-include/pem.h b/luprex/ext/openssl/pem.h
similarity index 100%
rename from luprex/ext/openssl-include/pem.h
rename to luprex/ext/openssl/pem.h
diff --git a/luprex/ext/openssl-include/pem2.h b/luprex/ext/openssl/pem2.h
similarity index 100%
rename from luprex/ext/openssl-include/pem2.h
rename to luprex/ext/openssl/pem2.h
diff --git a/luprex/ext/openssl-include/pemerr.h b/luprex/ext/openssl/pemerr.h
similarity index 100%
rename from luprex/ext/openssl-include/pemerr.h
rename to luprex/ext/openssl/pemerr.h
diff --git a/luprex/ext/openssl-include/pkcs12.h b/luprex/ext/openssl/pkcs12.h
similarity index 100%
rename from luprex/ext/openssl-include/pkcs12.h
rename to luprex/ext/openssl/pkcs12.h
diff --git a/luprex/ext/openssl-include/pkcs12err.h b/luprex/ext/openssl/pkcs12err.h
similarity index 100%
rename from luprex/ext/openssl-include/pkcs12err.h
rename to luprex/ext/openssl/pkcs12err.h
diff --git a/luprex/ext/openssl-include/pkcs7.h b/luprex/ext/openssl/pkcs7.h
similarity index 100%
rename from luprex/ext/openssl-include/pkcs7.h
rename to luprex/ext/openssl/pkcs7.h
diff --git a/luprex/ext/openssl-include/pkcs7err.h b/luprex/ext/openssl/pkcs7err.h
similarity index 100%
rename from luprex/ext/openssl-include/pkcs7err.h
rename to luprex/ext/openssl/pkcs7err.h
diff --git a/luprex/ext/openssl-include/prov_ssl.h b/luprex/ext/openssl/prov_ssl.h
similarity index 100%
rename from luprex/ext/openssl-include/prov_ssl.h
rename to luprex/ext/openssl/prov_ssl.h
diff --git a/luprex/ext/openssl-include/proverr.h b/luprex/ext/openssl/proverr.h
similarity index 100%
rename from luprex/ext/openssl-include/proverr.h
rename to luprex/ext/openssl/proverr.h
diff --git a/luprex/ext/openssl-include/provider.h b/luprex/ext/openssl/provider.h
similarity index 100%
rename from luprex/ext/openssl-include/provider.h
rename to luprex/ext/openssl/provider.h
diff --git a/luprex/ext/openssl-include/rand.h b/luprex/ext/openssl/rand.h
similarity index 100%
rename from luprex/ext/openssl-include/rand.h
rename to luprex/ext/openssl/rand.h
diff --git a/luprex/ext/openssl-include/randerr.h b/luprex/ext/openssl/randerr.h
similarity index 100%
rename from luprex/ext/openssl-include/randerr.h
rename to luprex/ext/openssl/randerr.h
diff --git a/luprex/ext/openssl-include/rc2.h b/luprex/ext/openssl/rc2.h
similarity index 100%
rename from luprex/ext/openssl-include/rc2.h
rename to luprex/ext/openssl/rc2.h
diff --git a/luprex/ext/openssl-include/rc4.h b/luprex/ext/openssl/rc4.h
similarity index 100%
rename from luprex/ext/openssl-include/rc4.h
rename to luprex/ext/openssl/rc4.h
diff --git a/luprex/ext/openssl-include/rc5.h b/luprex/ext/openssl/rc5.h
similarity index 100%
rename from luprex/ext/openssl-include/rc5.h
rename to luprex/ext/openssl/rc5.h
diff --git a/luprex/ext/openssl-include/ripemd.h b/luprex/ext/openssl/ripemd.h
similarity index 100%
rename from luprex/ext/openssl-include/ripemd.h
rename to luprex/ext/openssl/ripemd.h
diff --git a/luprex/ext/openssl-include/rsa.h b/luprex/ext/openssl/rsa.h
similarity index 100%
rename from luprex/ext/openssl-include/rsa.h
rename to luprex/ext/openssl/rsa.h
diff --git a/luprex/ext/openssl-include/rsaerr.h b/luprex/ext/openssl/rsaerr.h
similarity index 100%
rename from luprex/ext/openssl-include/rsaerr.h
rename to luprex/ext/openssl/rsaerr.h
diff --git a/luprex/ext/openssl-include/safestack.h b/luprex/ext/openssl/safestack.h
similarity index 100%
rename from luprex/ext/openssl-include/safestack.h
rename to luprex/ext/openssl/safestack.h
diff --git a/luprex/ext/openssl-include/seed.h b/luprex/ext/openssl/seed.h
similarity index 100%
rename from luprex/ext/openssl-include/seed.h
rename to luprex/ext/openssl/seed.h
diff --git a/luprex/ext/openssl-include/self_test.h b/luprex/ext/openssl/self_test.h
similarity index 100%
rename from luprex/ext/openssl-include/self_test.h
rename to luprex/ext/openssl/self_test.h
diff --git a/luprex/ext/openssl-include/sha.h b/luprex/ext/openssl/sha.h
similarity index 100%
rename from luprex/ext/openssl-include/sha.h
rename to luprex/ext/openssl/sha.h
diff --git a/luprex/ext/openssl-include/srp.h b/luprex/ext/openssl/srp.h
similarity index 100%
rename from luprex/ext/openssl-include/srp.h
rename to luprex/ext/openssl/srp.h
diff --git a/luprex/ext/openssl-include/srtp.h b/luprex/ext/openssl/srtp.h
similarity index 100%
rename from luprex/ext/openssl-include/srtp.h
rename to luprex/ext/openssl/srtp.h
diff --git a/luprex/ext/openssl-include/ssl.h b/luprex/ext/openssl/ssl.h
similarity index 100%
rename from luprex/ext/openssl-include/ssl.h
rename to luprex/ext/openssl/ssl.h
diff --git a/luprex/ext/openssl-include/ssl2.h b/luprex/ext/openssl/ssl2.h
similarity index 100%
rename from luprex/ext/openssl-include/ssl2.h
rename to luprex/ext/openssl/ssl2.h
diff --git a/luprex/ext/openssl-include/ssl3.h b/luprex/ext/openssl/ssl3.h
similarity index 100%
rename from luprex/ext/openssl-include/ssl3.h
rename to luprex/ext/openssl/ssl3.h
diff --git a/luprex/ext/openssl-include/sslerr.h b/luprex/ext/openssl/sslerr.h
similarity index 100%
rename from luprex/ext/openssl-include/sslerr.h
rename to luprex/ext/openssl/sslerr.h
diff --git a/luprex/ext/openssl-include/sslerr_legacy.h b/luprex/ext/openssl/sslerr_legacy.h
similarity index 100%
rename from luprex/ext/openssl-include/sslerr_legacy.h
rename to luprex/ext/openssl/sslerr_legacy.h
diff --git a/luprex/ext/openssl-include/stack.h b/luprex/ext/openssl/stack.h
similarity index 100%
rename from luprex/ext/openssl-include/stack.h
rename to luprex/ext/openssl/stack.h
diff --git a/luprex/ext/openssl-include/store.h b/luprex/ext/openssl/store.h
similarity index 100%
rename from luprex/ext/openssl-include/store.h
rename to luprex/ext/openssl/store.h
diff --git a/luprex/ext/openssl-include/storeerr.h b/luprex/ext/openssl/storeerr.h
similarity index 100%
rename from luprex/ext/openssl-include/storeerr.h
rename to luprex/ext/openssl/storeerr.h
diff --git a/luprex/ext/openssl-include/symhacks.h b/luprex/ext/openssl/symhacks.h
similarity index 100%
rename from luprex/ext/openssl-include/symhacks.h
rename to luprex/ext/openssl/symhacks.h
diff --git a/luprex/ext/openssl-include/tls1.h b/luprex/ext/openssl/tls1.h
similarity index 100%
rename from luprex/ext/openssl-include/tls1.h
rename to luprex/ext/openssl/tls1.h
diff --git a/luprex/ext/openssl-include/trace.h b/luprex/ext/openssl/trace.h
similarity index 100%
rename from luprex/ext/openssl-include/trace.h
rename to luprex/ext/openssl/trace.h
diff --git a/luprex/ext/openssl-include/ts.h b/luprex/ext/openssl/ts.h
similarity index 100%
rename from luprex/ext/openssl-include/ts.h
rename to luprex/ext/openssl/ts.h
diff --git a/luprex/ext/openssl-include/tserr.h b/luprex/ext/openssl/tserr.h
similarity index 100%
rename from luprex/ext/openssl-include/tserr.h
rename to luprex/ext/openssl/tserr.h
diff --git a/luprex/ext/openssl-include/txt_db.h b/luprex/ext/openssl/txt_db.h
similarity index 100%
rename from luprex/ext/openssl-include/txt_db.h
rename to luprex/ext/openssl/txt_db.h
diff --git a/luprex/ext/openssl-include/types.h b/luprex/ext/openssl/types.h
similarity index 100%
rename from luprex/ext/openssl-include/types.h
rename to luprex/ext/openssl/types.h
diff --git a/luprex/ext/openssl-include/ui.h b/luprex/ext/openssl/ui.h
similarity index 100%
rename from luprex/ext/openssl-include/ui.h
rename to luprex/ext/openssl/ui.h
diff --git a/luprex/ext/openssl-include/uierr.h b/luprex/ext/openssl/uierr.h
similarity index 100%
rename from luprex/ext/openssl-include/uierr.h
rename to luprex/ext/openssl/uierr.h
diff --git a/luprex/ext/openssl-include/whrlpool.h b/luprex/ext/openssl/whrlpool.h
similarity index 100%
rename from luprex/ext/openssl-include/whrlpool.h
rename to luprex/ext/openssl/whrlpool.h
diff --git a/luprex/ext/openssl-include/x509.h b/luprex/ext/openssl/x509.h
similarity index 100%
rename from luprex/ext/openssl-include/x509.h
rename to luprex/ext/openssl/x509.h
diff --git a/luprex/ext/openssl-include/x509_vfy.h b/luprex/ext/openssl/x509_vfy.h
similarity index 100%
rename from luprex/ext/openssl-include/x509_vfy.h
rename to luprex/ext/openssl/x509_vfy.h
diff --git a/luprex/ext/openssl-include/x509err.h b/luprex/ext/openssl/x509err.h
similarity index 100%
rename from luprex/ext/openssl-include/x509err.h
rename to luprex/ext/openssl/x509err.h
diff --git a/luprex/ext/openssl-include/x509v3.h b/luprex/ext/openssl/x509v3.h
similarity index 100%
rename from luprex/ext/openssl-include/x509v3.h
rename to luprex/ext/openssl/x509v3.h
diff --git a/luprex/ext/openssl-include/x509v3err.h b/luprex/ext/openssl/x509v3err.h
similarity index 100%
rename from luprex/ext/openssl-include/x509v3err.h
rename to luprex/ext/openssl/x509v3err.h