You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/02/01 19:51:10 UTC
svn commit: r1781301 - in /tomcat/native/trunk: native/NMAKEmakefile
xdocs/miscellaneous/changelog.xml
Author: markt
Date: Wed Feb 1 19:51:10 2017
New Revision: 1781301
URL: http://svn.apache.org/viewvc?rev=1781301&view=rev
Log:
Windows 64-bit build now possible with FIPS enabled OpenSSL
Modified:
tomcat/native/trunk/native/NMAKEmakefile
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/NMAKEmakefile
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/NMAKEmakefile?rev=1781301&r1=1781300&r2=1781301&view=diff
==============================================================================
--- tomcat/native/trunk/native/NMAKEmakefile (original)
+++ tomcat/native/trunk/native/NMAKEmakefile Wed Feb 1 19:51:10 2017
@@ -71,7 +71,11 @@ LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSS
LFLAGS = $(LFLAGS) /version:1.1
LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
LFLAGS = $(LFLAGS) $(APR_LIB)
+!IF DEFINED(WITH_FIPS)
+LFLAGS = $(LFLAGS) libeayfips32.lib libeaycompat32.lib ssleay32.lib /NODEFAULTLIB:LIBCMT
+!ELSE
LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib
+!ENDIF
CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA \
-DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_OPENSSL -DHAVE_SSL_SET_STATE=1
@@ -107,6 +111,16 @@ OBJECTS = \
$(WORKDIR)\ntpipe.obj \
$(WORKDIR)\registry.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
HEADERS = \
$(SRCDIR)\include\tcn.h \
@@ -140,7 +154,15 @@ $(BUILDRES): $(SRCDIR)\os\win32\libtcnat
$(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /fo $(BUILDRES) $(SRCDIR)\os\win32\libtcnative.rc
$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDBIN)
+ SET FIPSLINK=perl $(FIPSDIR)\bin\fipslink.pl
+ SET FIPS_LINK=$(LINK)
+ SET FIPS_CC=$(CC)
+ SET FIPS_CC_ARGS=/Fosrclib\openssl\tmp32\fips_premain.obj /MD -c
+ SET PREMAIN_DSO_EXE=srclib\openssl\\out32\fips_premain_dso.exe
+ SET FIPS_TARGET=$(BUILDBIN)
+ SET FIPS_SHA1_EXE=$(FIPSDIR)\bin\fips_standalone_sha1.exe
+ SET FIPSLIB_D=$(FIPSDIR)\lib
+ $(LINK_WRAPPER) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) $(FIPS_OPTS) /out:$(BUILDBIN)
IF EXIST $(BUILDMAN) \
mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1781301&r1=1781300&r2=1781301&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Feb 1 19:51:10 2017
@@ -41,6 +41,11 @@
the use of uninitialised variables. Based on patch by Ilya Maykov. (markt)
</fix>
<fix>
+ <bug>55113</bug>: Document the process for creating a static tc-native
+ library with a FIPS-enabled OpenSSL and update the nmake make file to
+ support the process. (markt)
+ </fix>
+ <fix>
<bug>55114</bug>: Clean up building instructions for the native component
and expand the instructions for building for Windows platforms. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org