OpenSSL 3.0.0 is minimum version so hard code OPENSSL_NEW_LIBS=1

Author: markt-asf

.github/workflows/makefile.yml

@@ -81,7 +81,7 @@ jobs:
             call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
             cd native
             echo "Building for ${{ matrix.build-arch }}"
-            nmake  -f NMAKEmakefile CPU=${{ matrix.build-arch }} WITH_APR=C:\APR WITH_OPENSSL=C:\OPENSSL APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1
+            nmake  -f NMAKEmakefile CPU=${{ matrix.build-arch }} WITH_APR=C:\APR WITH_OPENSSL=C:\OPENSSL APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid
     - uses: actions/upload-artifact@v4
       with:
         name: windows-artifact

native/BUILDING

@@ -165,10 +165,10 @@ Windows
    >set JAVA_HOME=C:\java\21.0.7-tem
 
    > "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
-   > nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-%APR_VER% WITH_OPENSSL=C:\deps-x86\openssl-%OPENSSL_VER% CPU=X86 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1
+   > nmake -f NMAKEMakefile WITH_APR=C:\deps-x86\apr-%APR_VER% WITH_OPENSSL=C:\deps-x86\openssl-%OPENSSL_VER% CPU=X86 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid
 
    > "c:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-   > nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-%APR_VER% WITH_OPENSSL=C:\deps-x64\openssl-%OPENSSL_VER% CPU=X64 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid OPENSSL_NEW_LIBS=1
+   > nmake -f NMAKEMakefile WITH_APR=C:\deps-x64\apr-%APR_VER% WITH_OPENSSL=C:\deps-x64\openssl-%OPENSSL_VER% CPU=X64 APR_DECLARE_STATIC=1 STATIC_CRT=Hybrid
 
    Tomcat Native Connector DLLs may then be found in native\WIN7_*_DLL_RELEASE    
 

native/NMAKEmakefile

@@ -19,7 +19,6 @@
 # Usage:
 #                 APR_DECLARE_STATIC=1  Use static version of the APR
 #                 DISABLE_OCSP=1        Disable OpenSSL OCSP code
-#                 OPENSSL_NEW_LIBS=1    Use new OpenSSL lib file names
 #                 DEBUG=1               Build DEBUG version of TCN
 #                 STATIC_CRT=Hybrid     Build using the 'Hybrid CRT' technique
 #
@@ -76,11 +75,7 @@ LIBS = $(LIBS) user32.lib gdi32.lib $(APR_LIB)
 LIBS = $(LIBS) libeayfips32.lib libeaycompat32.lib ssleay32.lib
 LFLAGS = $(LFLAGS) /NODEFAULTLIB:LIBCMT
 !ELSE
-!IF DEFINED(OPENSSL_NEW_LIBS)
 LIBS = $(LIBS) libssl.lib libcrypto.lib crypt32.lib
-!ELSE
-LIBS = $(LIBS) libeay32.lib ssleay32.lib
-!ENDIF
 !ENDIF
 
 CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA \

xdocs/miscellaneous/changelog.xml

@@ -61,6 +61,9 @@
       connections using TLS 1.2 and earlier. Pull request provided by gastush.
       (markt)
     </add>
+    <update>
+      Remove out of date options from make file. (markt)
+    </update>
   </changelog>
 </section>
 <section name="Changes in 2.0.9">