Skip to content

Commit db72c2a

Browse files
committed
No need for FIPS make options with OpenSSL 3.0.x onwards
1 parent 419885b commit db72c2a

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

native/NMAKEmakefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,7 @@ LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
7171

7272
LFLAGS = $(LFLAGS) /version:2.0
7373
LIBS = $(LIBS) user32.lib gdi32.lib $(APR_LIB)
74-
!IF DEFINED(WITH_FIPS)
75-
LIBS = $(LIBS) libeayfips32.lib libeaycompat32.lib ssleay32.lib
76-
LFLAGS = $(LFLAGS) /NODEFAULTLIB:LIBCMT
77-
!ELSE
7874
LIBS = $(LIBS) libssl.lib libcrypto.lib crypt32.lib
79-
!ENDIF
8075

8176
CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA \
8277
-DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_SSL_SET_STATE=1
@@ -94,16 +89,7 @@ OBJECTS = \
9489
$(WORKDIR)\sslutils.obj \
9590
$(WORKDIR)\system.obj
9691

97-
!IF DEFINED(WITH_FIPS)
98-
OBJECTS = $(OBJECTS) srclib\openssl\tmp32\fips_premain.obj
99-
!ENDIF
100-
101-
!IF DEFINED(WITH_FIPS)
102-
FIPS_OPTS = /map
103-
LINK_WRAPPER = perl $(FIPSDIR)\bin\fipslink.pl
104-
!ELSE
10592
LINK_WRAPPER = $(LINK)
106-
!ENDIF
10793

10894
BUILDLIB = $(PREFIX)\lib
10995
BUILDBIN = $(WORKDIR)\$(PROJECT).dll

0 commit comments

Comments
 (0)