components/openssl/openssl-0.9.8-fips-140/patches/23-noexstack.patch
author Ron Jordan <ron.jordan@oracle.com>
Mon, 20 Feb 2012 15:10:50 -0800
branchs11-sru
changeset 2245 33f69d07ad8a
parent 363 9c0cad004039
permissions -rw-r--r--
7131685 Need to upgrade openssl to 1.0.0g for CVE-2012-0050 7146824 S11 SRU openssl-1.0.0 Makefile variables unnecessarily differ from S11 Update

diff -ruN openssl-0.9.8k/Makefile.shared openssl-0.9.8k/Makefile.shared
--- openssl-0.9.8k/Makefile.shared	2008-09-17 17:56:40.000000000 +0200
+++ openssl-0.9.8k/Makefile.shared	2009-05-25 22:26:49.611468992 +0200
@@ -347,12 +347,17 @@
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
 	fi; \
 	$(LINK_SO_A)
+# Make sure the apps have non-executable stacks and data (x86/x64 only).
 link_app.solaris:
 	@ if ${DETECT_GNU_LD}; then \
 		$(DO_GNU_APP); \
 	else \
 		LDFLAGS="$(CFLAGS)"; \
 	fi; \
+	if expr $(PLATFORM) : '.*x86.*' > /dev/null; then \
+		LDFLAGS="$${LDFLAGS} -M/usr/lib/ld/map.noexdata"; \
+	fi; \
+	LDFLAGS="$${LDFLAGS} -M/usr/lib/ld/map.noexstk -M/usr/lib/ld/map.pagealign"; \
 	$(LINK_APP)
 
 # OpenServer 5 native compilers used