From 4dbe70f5cad7c030cb77bcd92f4404ffb167285c Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 17:22:35 +0300
Subject: [PATCH 01/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 45e52ac..efc0126 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -2,10 +2,10 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "workflow-test" ]
     paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp.yml' ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "workflow-test" ]
     paths: [ '**.c', '**.h', 'Makefile.**', '.github/configs', '.github/workflows/c-cpp.yml' ]
 
 jobs:
@@ -17,6 +17,7 @@ jobs:
           - ubuntu-latest
           - ubuntu-24.04-arm
           - macos-15
+          - windows-2022
     runs-on: ${{ matrix.target }}
     steps:
     - uses: actions/checkout@v4
@@ -28,12 +29,15 @@ jobs:
     - name: ln Mac
       if: ${{ startsWith(matrix.target, 'macos') }}
       run: ln -s Makefile.FreeBSD Makefile
+    - name: ln Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: copy Makefile.msvc64 Makefile
     - name: make
-      run: make -f Makefile
+      run: make
     - name: mkdir
       run: mkdir ~/3proxy
     - name: make install
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
-      run: make DESTDIR=~/3proxy -f Makefile install
+      run: make DESTDIR=~/3proxy install
     - name: make clean
-      run: make -f Makefile clean
+      run: make clean

From cd52c363bed5f4720e54a1285281a40bc250ed65 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 17:27:36 +0300
Subject: [PATCH 02/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index efc0126..e8242e1 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -32,6 +32,9 @@ jobs:
     - name: ln Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: copy Makefile.msvc64 Makefile
+    - name: make Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: make /F Makefile.msvc64 
     - name: make
       run: make
     - name: mkdir

From 0acd2e55e1bcc9be31617cd861b9caa43304b137 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 17:31:21 +0300
Subject: [PATCH 03/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e8242e1..4a5441c 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -32,10 +32,11 @@ jobs:
     - name: ln Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: copy Makefile.msvc64 Makefile
-    - name: make Windows
+    - name: nmake Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: make /F Makefile.msvc64 
+      run: nmake /F Makefile.msvc64 
     - name: make
+      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make
     - name: mkdir
       run: mkdir ~/3proxy

From 06992a4a3ac07aaf8ed410a833d7f0ab7fbec5f4 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 17:35:10 +0300
Subject: [PATCH 04/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 4a5441c..ce6a307 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -31,14 +31,11 @@ jobs:
       run: ln -s Makefile.FreeBSD Makefile
     - name: ln Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: copy Makefile.msvc64 Makefile
-    - name: nmake Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
-      run: nmake /F Makefile.msvc64 
+      run: copy Makefile.llvm Makefile
     - name: make
-      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make
     - name: mkdir
+      if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: mkdir ~/3proxy
     - name: make install
       if: ${{ startsWith(matrix.target, 'ubuntu') }}

From 4582790d8bbff6b1c70827dcab9751f9da02ad45 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 17:48:36 +0300
Subject: [PATCH 05/44] Update Makefile.llvm

---
 Makefile.llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index 00a3df4..efa2e54 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -10,7 +10,7 @@
 
 BUILDDIR = ../bin/
 CC = clang
-CFLAGS = -O2 -fno-strict-aliasing -c -pthread -static -DWITH_STD_MALLOC -DNOIPV6
+CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC -DNOIPV6
 COUT = -o 
 LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -static -s

From fc1c62a303f076993c59a11249543ead7c69e813 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 17:49:01 +0300
Subject: [PATCH 06/44] Update Makefile.llvm

---
 Makefile.llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index efa2e54..b254122 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -13,7 +13,7 @@ CC = clang
 CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC -DNOIPV6
 COUT = -o 
 LN = $(CC)
-LDFLAGS = -O2 -fno-strict-aliasing -static -s
+LDFLAGS = -O2 -fno-strict-aliasing -s
 DLFLAGS = -shared
 DLSUFFICS = .dll
 LIBS = -lws2_32 -lodbc32 -ladvapi32

From 5b61a0828b1facfeda4fd827500bd02bf424ba8b Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 17:56:54 +0300
Subject: [PATCH 07/44] Update pcre_plugin.c

---
 src/plugins/PCREPlugin/pcre_plugin.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/PCREPlugin/pcre_plugin.c b/src/plugins/PCREPlugin/pcre_plugin.c
index fbf65b4..5893e8d 100644
--- a/src/plugins/PCREPlugin/pcre_plugin.c
+++ b/src/plugins/PCREPlugin/pcre_plugin.c
@@ -13,6 +13,8 @@
 extern "C" {
 #endif
 
+#define PCRE_STATIC
+
 #ifndef isnumber
 #define isnumber(i_n_arg) ((i_n_arg>='0')&&(i_n_arg<='9'))
 #endif

From 20d7a5832a10b4b0df7e5da0374688d80b3f96f6 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:00:52 +0300
Subject: [PATCH 08/44] Update pcre_plugin.c

---
 src/plugins/PCREPlugin/pcre_plugin.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/plugins/PCREPlugin/pcre_plugin.c b/src/plugins/PCREPlugin/pcre_plugin.c
index 5893e8d..5482df0 100644
--- a/src/plugins/PCREPlugin/pcre_plugin.c
+++ b/src/plugins/PCREPlugin/pcre_plugin.c
@@ -7,14 +7,13 @@
 
 #include "../../structures.h"
 #include <string.h>
+#define PCRE_STATIC
 #include "pcre.h"
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#define PCRE_STATIC
-
 #ifndef isnumber
 #define isnumber(i_n_arg) ((i_n_arg>='0')&&(i_n_arg<='9'))
 #endif

From e256e906b1db0e1a3d2dffd766a5a6b7b4f1a59c Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:05:42 +0300
Subject: [PATCH 09/44] Update Makefile.win

---
 Makefile.win | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.win b/Makefile.win
index 261833b..481ac61 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -10,7 +10,7 @@
 
 BUILDDIR = ../bin/
 CC = gcc
-CFLAGS = -O2 -s -c -mthreads -DWITH_STD_MALLOC -DNOIPV6 -DNORADIUS
+CFLAGS = -O2 -s -c -mthreads -DWITH_STD_MALLOC
 COUT = -o 
 LN = gcc
 LDFLAGS = -O2 -s -mthreads

From 759562890adb54ebae8a62a7811e6f6339de9cca Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:08:45 +0300
Subject: [PATCH 10/44] Update Makefile.llvm

---
 Makefile.llvm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index b254122..b742092 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -10,7 +10,7 @@
 
 BUILDDIR = ../bin/
 CC = clang
-CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC -DNOIPV6
+CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC 
 COUT = -o 
 LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -s
@@ -28,7 +28,7 @@ REMOVECOMMAND = rm -f
 AFTERCLEAN = find src/ -type f -name "*.o" -delete && find src/ -type f -name "Makefile.var" -delete && find bin/ -type f -executable -delete
 TYPECOMMAND = cat
 COMPATLIBS =
-MAKEFILE = Makefile.win
+MAKEFILE = Makefile.llvm
 PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
 
 include Makefile.inc

From 573b7f9a15b6ecadbc4637c9f78306a64a013640 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:19:27 +0300
Subject: [PATCH 11/44] Update Makefile.llvm

---
 Makefile.llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index b742092..80e8f5c 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -16,7 +16,7 @@ LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -s
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32
+LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 

From 5ab4e99cade7a6b5a103168d7b857d6b2646f2b6 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:23:28 +0300
Subject: [PATCH 12/44] Update Makefile.llvm

---
 Makefile.llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index 80e8f5c..f7c0e11 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -34,4 +34,4 @@ PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlu
 include Makefile.inc
 
 allplugins:
-	for /D %%i in ($(PLUGINS)) do (copy Makefile plugins\%%i && copy Makefile.var plugins\%%i && cd plugins\%%i && nmake && del *.o &&cd ..\..)
+	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done

From afc02d8e1f65ffef4b7c33d5c234ff55a64da92b Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:28:37 +0300
Subject: [PATCH 13/44] Update Makefile.llvm

---
 Makefile.llvm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index f7c0e11..1e99f72 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -10,13 +10,13 @@
 
 BUILDDIR = ../bin/
 CC = clang
-CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC 
+CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC -DWITH_SSL -DWITH_WSAPOLL
 COUT = -o 
 LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -s
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32
+LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32 -lcrypto.lib -ssl.lib
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 

From 28577c4bf3554a77c412c5fdfe670f3a0863f53d Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:32:46 +0300
Subject: [PATCH 14/44] Update Makefile.llvm

---
 Makefile.llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index 1e99f72..d690bfe 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -10,7 +10,7 @@
 
 BUILDDIR = ../bin/
 CC = clang
-CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC -DWITH_SSL -DWITH_WSAPOLL
+CFLAGS = -O2 -fno-strict-aliasing -c -pthread -DWITH_STD_MALLOC -DWITH_WSAPOLL
 COUT = -o 
 LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -s

From 3590fecb9a4832d4d3b4367c60ee093d26d5d495 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:35:39 +0300
Subject: [PATCH 15/44] Update Makefile.llvm

---
 Makefile.llvm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index d690bfe..ed5ec7d 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -16,7 +16,7 @@ LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -s
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32 -lcrypto.lib -ssl.lib
+LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32 -lcrypto -lssl
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 
@@ -29,7 +29,7 @@ AFTERCLEAN = find src/ -type f -name "*.o" -delete && find src/ -type f -name "M
 TYPECOMMAND = cat
 COMPATLIBS =
 MAKEFILE = Makefile.llvm
-PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
+PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin SSLPLugin
 
 include Makefile.inc
 

From 0b3126dc5c72bae2209f95709d2b677799b479f3 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:41:55 +0300
Subject: [PATCH 16/44] Update Makefile.llvm

---
 Makefile.llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index ed5ec7d..61bfee3 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -16,7 +16,7 @@ LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -s
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32 -lcrypto -lssl
+LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32 -llibcrypto.lib -llibssl.lib
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 

From c4f740db6319f142657c55a6c773898aef7d978d Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:53:44 +0300
Subject: [PATCH 17/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index ce6a307..b2f7824 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -32,7 +32,14 @@ jobs:
     - name: ln Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: copy Makefile.llvm Makefile
+    - name: dir Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: dir \
+    - name: set Windows
+      if: ${{ startsWith(matrix.target, 'windows') }}
+      run: set
     - name: make
+      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make
     - name: mkdir
       if: ${{ startsWith(matrix.target, 'ubuntu') }}

From 14a4c11b9e995d57fb63f779b886b65d231ea208 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:55:06 +0300
Subject: [PATCH 18/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index b2f7824..2d007c1 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,10 +34,10 @@ jobs:
       run: copy Makefile.llvm Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: dir \
+      run: dir \a
     - name: set Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: set
+      run: cmd /c set
     - name: make
       if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From 6ee863ad831d25702ed55a2e37a65d74abcf94e8 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:58:50 +0300
Subject: [PATCH 19/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 2d007c1..2a3dd19 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.llvm Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: dir \a
+      run: dir C:\Program Files\OpenSSL\lib
     - name: set Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: cmd /c set

From 2c02b7e0a51b73b13a18eea94758022885a4d5bf Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 18:59:56 +0300
Subject: [PATCH 20/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 2a3dd19..35aa7bd 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.llvm Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: dir C:\Program Files\OpenSSL\lib
+      run: dir "C:\Program Files\OpenSSL\lib"
     - name: set Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: cmd /c set

From 003fd26a6441d8e260757e698cfd171559331a86 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:03:18 +0300
Subject: [PATCH 21/44] Update Makefile.llvm

---
 Makefile.llvm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index 61bfee3..aead7bf 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -16,7 +16,7 @@ LN = $(CC)
 LDFLAGS = -O2 -fno-strict-aliasing -s
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32 -llibcrypto.lib -llibssl.lib
+LIBS = -lws2_32 -lodbc32 -ladvapi32 -luser32
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 
@@ -29,7 +29,7 @@ AFTERCLEAN = find src/ -type f -name "*.o" -delete && find src/ -type f -name "M
 TYPECOMMAND = cat
 COMPATLIBS =
 MAKEFILE = Makefile.llvm
-PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin SSLPLugin
+PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
 
 include Makefile.inc
 

From 086971a587191d2105644b1202fb2d4cbe68076e Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:05:12 +0300
Subject: [PATCH 22/44] Update Makefile.win

---
 Makefile.win | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.win b/Makefile.win
index 481ac61..6e8fa26 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -10,13 +10,13 @@
 
 BUILDDIR = ../bin/
 CC = gcc
-CFLAGS = -O2 -s -c -mthreads -DWITH_STD_MALLOC
+CFLAGS = -O2 -s -c -mthreads -DWITH_STD_MALLOC -DWITH_WSAPOLL 
 COUT = -o 
 LN = gcc
 LDFLAGS = -O2 -s -mthreads
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32
+LIBS = -lws2_32 -lodbc32 -ladvapi32 libcrypto.lib libssl.lib
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 
@@ -28,7 +28,7 @@ REMOVECOMMAND = rm -f
 TYPECOMMAND = cat
 COMPATLIBS =
 MAKEFILE = Makefile.win
-PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin
+PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlugin SSLPLugin
 
 include Makefile.inc
 

From 3e77e4a8a55c412c9398fb6a67071a2d43ba4960 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:06:38 +0300
Subject: [PATCH 23/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 35aa7bd..4e5a402 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -31,7 +31,7 @@ jobs:
       run: ln -s Makefile.FreeBSD Makefile
     - name: ln Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: copy Makefile.llvm Makefile
+      run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: dir "C:\Program Files\OpenSSL\lib"
@@ -39,7 +39,7 @@ jobs:
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: cmd /c set
     - name: make
-      if: ${{ !startsWith(matrix.target, 'windows') }}
+#      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make
     - name: mkdir
       if: ${{ startsWith(matrix.target, 'ubuntu') }}

From c72c1d7d25c3a97217c241ba3b29a5480e07c13f Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:08:58 +0300
Subject: [PATCH 24/44] Update Makefile.win

---
 Makefile.win | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.win b/Makefile.win
index 6e8fa26..32ed2d6 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -16,7 +16,7 @@ LN = gcc
 LDFLAGS = -O2 -s -mthreads
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32 libcrypto.lib libssl.lib
+LIBS = -lws2_32 -lodbc32 -ladvapi32 -lcrypto -lssl
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 

From d95b18f19f51d776bf10b777acff4671f9a79356 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:14:06 +0300
Subject: [PATCH 25/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 4e5a402..7b814fd 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: dir "C:\Program Files\OpenSSL\lib"
+      run: gcc -print-search-dirs
     - name: set Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: cmd /c set

From 1a0f4325c5b1779ee8d2070271e0702363fc8a00 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:23:29 +0300
Subject: [PATCH 26/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 7b814fd..3351eb3 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,10 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: gcc -print-search-dirs
-    - name: set Windows
-      if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /c set
+      run: echo LIBS= -L c:/program files/openssl/lib;$LIBS >>Makefile.win
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From 816ccb6e2f9972d21c4bb4612e46bdd9d22fc11e Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:26:43 +0300
Subject: [PATCH 27/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 3351eb3..5270828 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: echo LIBS= -L c:/program files/openssl/lib;$LIBS >>Makefile.win
+      run: "echo LIBS= -L c:/program files/openssl/lib;$LIBS >>Makefile.win && type Makefile.win"
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From 051a55768b8a99cfd76e2a00643735cd882156ef Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:28:28 +0300
Subject: [PATCH 28/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 5270828..8ef650c 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: "echo LIBS= -L c:/program files/openssl/lib;$LIBS >>Makefile.win && type Makefile.win"
+      run: cmd /C "echo LIBS= -L c:/program files/openssl/lib;$LIBS >>Makefile.win && type Makefile.win"
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From c7327f9e9ef060022414a1f28634d03433f1a281 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:31:14 +0300
Subject: [PATCH 29/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 8ef650c..e003628 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /C "echo LIBS= -L c:/program files/openssl/lib;$LIBS >>Makefile.win && type Makefile.win"
+      run: cmd /C "echo LIBS= -L \"c:/program files/openssl/lib \$LIBS\" >>Makefile.win && type Makefile.win"
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From a55e44a90d0c3109bee58ba6a1842fefa1821485 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:34:14 +0300
Subject: [PATCH 30/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e003628..2a44ba2 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /C "echo LIBS= -L \"c:/program files/openssl/lib \$LIBS\" >>Makefile.win && type Makefile.win"
+      run: cmd /C 'echo LIBS= -L "c:/program files/openssl/lib" \$LIBS >>Makefile.win && type Makefile.win'
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From 029b0263005eb351beec808235a5e7a792896d10 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:35:47 +0300
Subject: [PATCH 31/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 2a44ba2..6192715 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /C 'echo LIBS= -L "c:/program files/openssl/lib" \$LIBS >>Makefile.win && type Makefile.win'
+      run: cmd /C 'echo LIBS= -L "c:/program files/openssl/lib" $LIBS >>Makefile.win && type Makefile.win'
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From 812aa215ef84c1d9ee9563eb66c1b06748f39bee Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:37:45 +0300
Subject: [PATCH 32/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 6192715..852ee0a 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /C 'echo LIBS= -L "c:/program files/openssl/lib" $LIBS >>Makefile.win && type Makefile.win'
+      run: cmd /C 'echo LIBS= -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && type Makefile.win'
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From a1bcfe475cae653cbbec96955353ca93373f8f86 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:45:01 +0300
Subject: [PATCH 33/44] Update Makefile.win

---
 Makefile.win | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.win b/Makefile.win
index 32ed2d6..7fc1ee0 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -34,3 +34,5 @@ include Makefile.inc
 
 allplugins:
 	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;  rm *.o ; cd ../.. ; done
+
+

From 97f9d5390a0a057dc001d58f06797ca36b634085 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:50:20 +0300
Subject: [PATCH 34/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 852ee0a..491f3b5 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /C 'echo LIBS= -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && type Makefile.win'
+      run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && type Makefile.win'
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From e21cae7909199c3831ed82fce0996657a9465e73 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 19:58:12 +0300
Subject: [PATCH 35/44] Update ssl_plugin.c

---
 src/plugins/SSLPlugin/ssl_plugin.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c
index ac890ad..b42d84d 100644
--- a/src/plugins/SSLPlugin/ssl_plugin.c
+++ b/src/plugins/SSLPlugin/ssl_plugin.c
@@ -6,7 +6,6 @@
 */
 
 #include "../../structures.h"
-#include <openssl/rsa.h>       /* SSLeay stuff */
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>

From c0d4426e959eb5e5a430a7c4ab01c58bbbd8916a Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:02:16 +0300
Subject: [PATCH 36/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 491f3b5..e6e3a72 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -34,7 +34,7 @@ jobs:
       run: copy Makefile.win Makefile
     - name: dir Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
-      run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && type Makefile.win'
+      run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
     - name: make
 #      if: ${{ !startsWith(matrix.target, 'windows') }}
       run: make

From 76fbc7813bfedbd8bc64dc3ebeb4e02f93d5bf32 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:14:57 +0300
Subject: [PATCH 37/44] make compatible with openssl 1.x

---
 src/plugins/SSLPlugin/ssl_plugin.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/plugins/SSLPlugin/ssl_plugin.c b/src/plugins/SSLPlugin/ssl_plugin.c
index b42d84d..ef0dea5 100644
--- a/src/plugins/SSLPlugin/ssl_plugin.c
+++ b/src/plugins/SSLPlugin/ssl_plugin.c
@@ -438,18 +438,14 @@ static void* ssl_filter_open(void * idata, struct srvparam * srv){
 	    if(sc->client_cipher_list)SSL_CTX_set_cipher_list(sc->srv_ctx, sc->client_cipher_list);
 	    if(sc->client_ciphersuites)SSL_CTX_set_ciphersuites(sc->srv_ctx, sc->client_ciphersuites);
 	    if(sc->client_verify){
-		if(sc->client_ca_file && sc->client_ca_dir){
+		if(sc->client_ca_file || sc->client_ca_dir){
 		    SSL_CTX_load_verify_locations(sc->srv_ctx, sc->client_ca_file, sc->client_ca_dir);
 		}
-		else if(sc->client_ca_file){
-		    SSL_CTX_load_verify_file(sc->srv_ctx, sc->client_ca_file);
-		}
-		else if(sc->client_ca_dir){
-		    SSL_CTX_load_verify_dir(sc->srv_ctx, sc->client_ca_dir);
-		}
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
 		else if(sc->client_ca_store){
 		    SSL_CTX_load_verify_store(sc->srv_ctx, sc->client_ca_store);
-		}		
+		}
+#endif		
 		else 
 		    SSL_CTX_set_default_verify_paths(sc->srv_ctx);
 		SSL_CTX_set_verify(sc->srv_ctx, SSL_VERIFY_PEER, verify_callback);

From 78eda5aa46fe23b11ea79364d8401e310387757f Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:24:24 +0300
Subject: [PATCH 38/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index e6e3a72..c4f874b 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -32,11 +32,13 @@ jobs:
     - name: ln Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: copy Makefile.win Makefile
-    - name: dir Windows
+    - name: dirs Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
-    - name: make
-#      if: ${{ !startsWith(matrix.target, 'windows') }}
+    - name: SSLPlugin Linux
+      if: ${{ !startsWith(matrix.target, 'windows') }}
+      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -l:libcrypto.a -l:libssl.a >>Makefile'
+      - name: make
       run: make
     - name: mkdir
       if: ${{ startsWith(matrix.target, 'ubuntu') }}

From a85bde7413cccd59853c78266dd1195ab25c7808 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:26:59 +0300
Subject: [PATCH 39/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index c4f874b..11b34b6 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -35,10 +35,10 @@ jobs:
     - name: dirs Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
-    - name: SSLPlugin Linux
+    - name: SSLPlugin
       if: ${{ !startsWith(matrix.target, 'windows') }}
       run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -l:libcrypto.a -l:libssl.a >>Makefile'
-      - name: make
+    - name: make
       run: make
     - name: mkdir
       if: ${{ startsWith(matrix.target, 'ubuntu') }}

From 4cd1f0a526f077db253d2538c737369a117ce4c1 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:28:35 +0300
Subject: [PATCH 40/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 11b34b6..167f020 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -37,7 +37,7 @@ jobs:
       run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
     - name: SSLPlugin
       if: ${{ !startsWith(matrix.target, 'windows') }}
-      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -l:libcrypto.a -l:libssl.a >>Makefile'
+      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
     - name: make
       run: make
     - name: mkdir

From afe420f44f634f4d79c1ee792bab055768e6c484 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:31:12 +0300
Subject: [PATCH 41/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 167f020..dd1692e 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -37,7 +37,10 @@ jobs:
       run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
     - name: SSLPlugin
       if: ${{ !startsWith(matrix.target, 'windows') }}
-      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
+      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile'
+    - name: SSLPlugin Linux
+      if: ${{ !startsWith(matrix.target, 'windows') }}
+      run: 'echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
     - name: make
       run: make
     - name: mkdir

From b82ac8f95b9a63655ed0ab7106d1d84520a353b9 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:31:39 +0300
Subject: [PATCH 42/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index dd1692e..707fef6 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -39,7 +39,7 @@ jobs:
       if: ${{ !startsWith(matrix.target, 'windows') }}
       run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile'
     - name: SSLPlugin Linux
-      if: ${{ !startsWith(matrix.target, 'windows') }}
+      if: ${{ startsWith(matrix.target, 'ubuntu') }}
       run: 'echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
     - name: make
       run: make

From 394ea892a149a614b1dcdc30e33acd79e2f80c32 Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:33:45 +0300
Subject: [PATCH 43/44] Update c-cpp.yml

---
 .github/workflows/c-cpp.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 707fef6..ccaa136 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -35,12 +35,9 @@ jobs:
     - name: dirs Windows
       if: ${{ startsWith(matrix.target, 'windows') }}
       run: cmd /C 'echo LIBS := -L "c:/program files/openssl/lib" $(LIBS) >>Makefile.win && echo CFLAGS := -I "c:/program files/openssl/include" $(CFLAGS) >>Makefile.win && type Makefile.win'
-    - name: SSLPlugin
-      if: ${{ !startsWith(matrix.target, 'windows') }}
-      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile'
     - name: SSLPlugin Linux
       if: ${{ startsWith(matrix.target, 'ubuntu') }}
-      run: 'echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
+      run: 'echo PLUGINS := $(PLUGINS) SSLPlugin >>Makefile & echo LIBS := $(LIBS) -lcrypto -lssl >>Makefile'
     - name: make
       run: make
     - name: mkdir

From 0c4177aee1d5c2632d1d9a6f9ddab5390d41896a Mon Sep 17 00:00:00 2001
From: Vladimir Dubrovin <3proxy@3proxy.ru>
Date: Fri, 14 Mar 2025 20:40:41 +0300
Subject: [PATCH 44/44] makefiles change

---
 Makefile.llvm | 3 ++-
 Makefile.win  | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.llvm b/Makefile.llvm
index aead7bf..954501e 100644
--- a/Makefile.llvm
+++ b/Makefile.llvm
@@ -34,4 +34,5 @@ PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlu
 include Makefile.inc
 
 allplugins:
-	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
+    @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;	cd ../.. ; done
+    
\ No newline at end of file
diff --git a/Makefile.win b/Makefile.win
index 7fc1ee0..63242ee 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -16,7 +16,7 @@ LN = gcc
 LDFLAGS = -O2 -s -mthreads
 DLFLAGS = -shared
 DLSUFFICS = .dll
-LIBS = -lws2_32 -lodbc32 -ladvapi32 -lcrypto -lssl
+LIBS = -lws2_32 -lodbc32 -ladvapi32 -lcrypto -luser32 -lssl
 LIBSPREFIX = -l
 LIBSSUFFIX = 
 LNOUT = -o 
@@ -33,6 +33,5 @@ PLUGINS = utf8tocp1251 WindowsAuthentication TrafficPlugin StringsPlugin PCREPlu
 include Makefile.inc
 
 allplugins:
-	@list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;  rm *.o ; cd ../.. ; done
-
+    @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ;  rm *.o ; cd ../.. ; done