This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new db72c2afc No need for FIPS make options with OpenSSL 3.0.x onwards
db72c2afc is described below
commit db72c2afca70b0c62d566a3d4a388249704b92e7
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Dec 16 18:37:46 2025 +0000
No need for FIPS make options with OpenSSL 3.0.x onwards
---
native/NMAKEmakefile | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index f5c59167c..33249a48b 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -71,12 +71,7 @@ LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
LFLAGS = $(LFLAGS) /version:2.0
LIBS = $(LIBS) user32.lib gdi32.lib $(APR_LIB)
-!IF DEFINED(WITH_FIPS)
-LIBS = $(LIBS) libeayfips32.lib libeaycompat32.lib ssleay32.lib
-LFLAGS = $(LFLAGS) /NODEFAULTLIB:LIBCMT
-!ELSE
LIBS = $(LIBS) libssl.lib libcrypto.lib crypt32.lib
-!ENDIF
CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2
-DOPENSSL_NO_IDEA \
-DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_SSL_SET_STATE=1
@@ -94,16 +89,7 @@ OBJECTS = \
$(WORKDIR)\sslutils.obj \
$(WORKDIR)\system.obj
-!IF DEFINED(WITH_FIPS)
-OBJECTS = $(OBJECTS) srclib\openssl\tmp32\fips_premain.obj
-!ENDIF
-
-!IF DEFINED(WITH_FIPS)
-FIPS_OPTS = /map
-LINK_WRAPPER = perl $(FIPSDIR)\bin\fipslink.pl
-!ELSE
LINK_WRAPPER = $(LINK)
-!ENDIF
BUILDLIB = $(PREFIX)\lib
BUILDBIN = $(WORKDIR)\$(PROJECT).dll
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
