From 965f0e55d4136f7f78aa1bd05695302c980765d2 Mon Sep 17 00:00:00 2001 From: Yunmi Ha Date: Wed, 16 Aug 2017 17:33:16 +0900 Subject: [PATCH] Enable ASLR feature Change-Id: I0b1ae9a80d2c30fedd8ef1dc9b97dea2ed6f048f Signed-off-by: Yunmi Ha --- src/Makefile.am | 11 +++++++---- src/Makefile.in | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ee0c814..4127fbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,8 @@ cryptsetup_LDADD = \ @POPT_LIBS@ \ @PWQUALITY_LIBS@ -cryptsetup_CFLAGS = $(AM_CFLAGS) -Wall +cryptsetup_CFLAGS = $(AM_CFLAGS) -Wall -fPIE +cryptsetup_LDFLAGS = $(AM_LDFLAGS) -pie sbin_PROGRAMS=cryptsetup @@ -31,7 +32,7 @@ if STATIC_TOOLS sbin_PROGRAMS += cryptsetup.static cryptsetup_static_SOURCES = $(cryptsetup_SOURCES) cryptsetup_static_CFLAGS = $(cryptsetup_CFLAGS) -cryptsetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static +cryptsetup_static_LDFLAGS = $(cryptsetup_LDFLAGS) -all-static cryptsetup_static_LDADD = $(cryptsetup_LDADD) \ @CRYPTO_STATIC_LIBS@ \ @PWQUALITY_STATIC_LIBS@ \ @@ -54,6 +55,7 @@ veritysetup_LDADD = \ @POPT_LIBS@ veritysetup_CFLAGS = $(cryptsetup_CFLAGS) +veritysetup_LDFLAGS = $(cryptsetup_LDFLAGS) sbin_PROGRAMS += veritysetup @@ -61,7 +63,7 @@ if STATIC_TOOLS sbin_PROGRAMS += veritysetup.static veritysetup_static_SOURCES = $(veritysetup_SOURCES) veritysetup_static_CFLAGS = $(veritysetup_CFLAGS) -veritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static +veritysetup_static_LDFLAGS = $(veritysetup_LDFLAGS) -all-static veritysetup_static_LDADD = $(veritysetup_LDADD) \ @CRYPTO_STATIC_LIBS@ \ @DEVMAPPER_STATIC_LIBS@ \ @@ -79,6 +81,7 @@ cryptsetup_reencrypt_SOURCES = \ cryptsetup_reencrypt_LDADD = $(cryptsetup_LDADD) cryptsetup_reencrypt_CFLAGS = $(cryptsetup_CFLAGS) +cryptsetup_reencrypt_LDFLAGS = $(cryptsetup_LDFLAGS) sbin_PROGRAMS += cryptsetup-reencrypt @@ -86,7 +89,7 @@ if STATIC_TOOLS sbin_PROGRAMS += cryptsetup-reencrypt.static cryptsetup_reencrypt_static_SOURCES = $(cryptsetup_reencrypt_SOURCES) cryptsetup_reencrypt_static_CFLAGS = $(cryptsetup_reencrypt_CFLAGS) -cryptsetup_reencrypt_static_LDFLAGS = $(AM_LDFLAGS) -all-static +cryptsetup_reencrypt_static_LDFLAGS = $(cryptsetup_reencrypt_LDFLAGS) -all-static cryptsetup_reencrypt_static_LDADD = $(cryptsetup_reencrypt_LDADD) \ @CRYPTO_STATIC_LIBS@ \ @DEVMAPPER_STATIC_LIBS@ \ diff --git a/src/Makefile.in b/src/Makefile.in index 45ed671..e570249 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -124,7 +124,7 @@ am__v_lt_0 = --silent am__v_lt_1 = cryptsetup_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(cryptsetup_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(CFLAGS) $(cryptsetup_LDFLAGS) $(LDFLAGS) -o $@ am__cryptsetup_reencrypt_SOURCES_DIST = \ $(top_builddir)/lib/utils_crypt.c utils_tools.c \ cryptsetup_reencrypt.c cryptsetup.h @@ -138,8 +138,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/lib/libcryptsetup.la @REENCRYPT_TRUE@ $(am__DEPENDENCIES_1) cryptsetup_reencrypt_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(cryptsetup_reencrypt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(cryptsetup_reencrypt_CFLAGS) $(CFLAGS) \ + $(cryptsetup_reencrypt_LDFLAGS) $(LDFLAGS) -o $@ am__cryptsetup_reencrypt_static_SOURCES_DIST = \ $(top_builddir)/lib/utils_crypt.c utils_tools.c \ cryptsetup_reencrypt.c cryptsetup.h @@ -189,7 +189,7 @@ veritysetup_OBJECTS = $(am_veritysetup_OBJECTS) @VERITYSETUP_TRUE@ $(top_builddir)/lib/libcryptsetup.la veritysetup_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(veritysetup_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(CFLAGS) $(veritysetup_LDFLAGS) $(LDFLAGS) -o $@ am__veritysetup_static_SOURCES_DIST = \ $(top_builddir)/lib/utils_crypt.c \ $(top_builddir)/lib/utils_loop.c utils_tools.c veritysetup.c \ @@ -471,10 +471,11 @@ cryptsetup_LDADD = \ @POPT_LIBS@ \ @PWQUALITY_LIBS@ -cryptsetup_CFLAGS = $(AM_CFLAGS) -Wall +cryptsetup_CFLAGS = $(AM_CFLAGS) -Wall -fPIE +cryptsetup_LDFLAGS = $(AM_LDFLAGS) -pie @STATIC_TOOLS_TRUE@cryptsetup_static_SOURCES = $(cryptsetup_SOURCES) @STATIC_TOOLS_TRUE@cryptsetup_static_CFLAGS = $(cryptsetup_CFLAGS) -@STATIC_TOOLS_TRUE@cryptsetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static +@STATIC_TOOLS_TRUE@cryptsetup_static_LDFLAGS = $(cryptsetup_LDFLAGS) -all-static @STATIC_TOOLS_TRUE@cryptsetup_static_LDADD = $(cryptsetup_LDADD) \ @STATIC_TOOLS_TRUE@ @CRYPTO_STATIC_LIBS@ \ @STATIC_TOOLS_TRUE@ @PWQUALITY_STATIC_LIBS@ \ @@ -495,9 +496,10 @@ cryptsetup_CFLAGS = $(AM_CFLAGS) -Wall @VERITYSETUP_TRUE@ @POPT_LIBS@ @VERITYSETUP_TRUE@veritysetup_CFLAGS = $(cryptsetup_CFLAGS) +@VERITYSETUP_TRUE@veritysetup_LDFLAGS = $(cryptsetup_LDFLAGS) @STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@veritysetup_static_SOURCES = $(veritysetup_SOURCES) @STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@veritysetup_static_CFLAGS = $(veritysetup_CFLAGS) -@STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@veritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static +@STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@veritysetup_static_LDFLAGS = $(veritysetup_LDFLAGS) -all-static @STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@veritysetup_static_LDADD = $(veritysetup_LDADD) \ @STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@ @CRYPTO_STATIC_LIBS@ \ @STATIC_TOOLS_TRUE@@VERITYSETUP_TRUE@ @DEVMAPPER_STATIC_LIBS@ \ @@ -513,9 +515,10 @@ cryptsetup_CFLAGS = $(AM_CFLAGS) -Wall @REENCRYPT_TRUE@cryptsetup_reencrypt_LDADD = $(cryptsetup_LDADD) @REENCRYPT_TRUE@cryptsetup_reencrypt_CFLAGS = $(cryptsetup_CFLAGS) +@REENCRYPT_TRUE@cryptsetup_reencrypt_LDFLAGS = $(cryptsetup_LDFLAGS) @REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@cryptsetup_reencrypt_static_SOURCES = $(cryptsetup_reencrypt_SOURCES) @REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@cryptsetup_reencrypt_static_CFLAGS = $(cryptsetup_reencrypt_CFLAGS) -@REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@cryptsetup_reencrypt_static_LDFLAGS = $(AM_LDFLAGS) -all-static +@REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@cryptsetup_reencrypt_static_LDFLAGS = $(cryptsetup_reencrypt_LDFLAGS) -all-static @REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@cryptsetup_reencrypt_static_LDADD = $(cryptsetup_reencrypt_LDADD) \ @REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@ @CRYPTO_STATIC_LIBS@ \ @REENCRYPT_TRUE@@STATIC_TOOLS_TRUE@ @DEVMAPPER_STATIC_LIBS@ \ -- 2.7.4