From: Steven Barth <cyrus@openwrt.org>
Date: Wed, 24 Jun 2015 10:57:14 +0000 (+0000)
Subject: hardening: make override variables more intuitive
X-Git-Tag: reboot~2682
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6010a1cdb729aefdb1121b29b26347c664e20fff;p=openwrt%2Fstaging%2Fnoltari.git

hardening: make override variables more intuitive

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 46119
---

diff --git a/include/hardening.mk b/include/hardening.mk
index c1f0bcb19e..c277081c51 100644
--- a/include/hardening.mk
+++ b/include/hardening.mk
@@ -6,12 +6,9 @@
 #
 
 PKG_CHECK_FORMAT_SECURITY ?= 1
-PKG_CC_STACKPROTECTOR_REGULAR ?= 1
-PKG_CC_STACKPROTECTOR_STRONG ?= 1
-PKG_FORTIFY_SOURCE_1 ?= 1
-PKG_FORTIFY_SOURCE_2 ?= 1
-PKG_RELRO_PARTIAL ?= 1
-PKG_RELRO_FULL ?= 1
+PKG_SSP ?= 1
+PKG_FORTIFY_SOURCE ?= 1
+PKG_RELRO ?= 1
 
 ifdef CONFIG_PKG_CHECK_FORMAT_SECURITY
   ifeq ($(strip $(PKG_CHECK_FORMAT_SECURITY)),1)
@@ -19,33 +16,33 @@ ifdef CONFIG_PKG_CHECK_FORMAT_SECURITY
   endif
 endif
 ifdef CONFIG_PKG_CC_STACKPROTECTOR_REGULAR
-  ifeq ($(strip $(PKG_CC_STACKPROTECTOR_REGULAR)),1)
+  ifeq ($(strip $(PKG_SSP)),1)
     TARGET_CFLAGS += -fstack-protector
   endif
 endif
 ifdef CONFIG_PKG_CC_STACKPROTECTOR_STRONG
-  ifeq ($(strip $(PKG_CC_STACKPROTECTOR_STRONG)),1)
+  ifeq ($(strip $(PKG_SSP)),1)
     TARGET_CFLAGS += -fstack-protector-strong
   endif
 endif
 ifdef CONFIG_PKG_FORTIFY_SOURCE_1
-  ifeq ($(strip $(PKG_FORTIFY_SOURCE_1)),1)
+  ifeq ($(strip $(PKG_FORTIFY_SOURCE)),1)
     TARGET_CFLAGS += -D_FORTIFY_SOURCE=1
   endif
 endif
 ifdef CONFIG_PKG_FORTIFY_SOURCE_2
-  ifeq ($(strip $(PKG_FORTIFY_SOURCE_2)),1)
+  ifeq ($(strip $(PKG_FORTIFY_SOURCE)),1)
     TARGET_CFLAGS += -D_FORTIFY_SOURCE=2
   endif
 endif
 ifdef CONFIG_PKG_RELRO_PARTIAL
-  ifeq ($(strip $(PKG_RELRO_PARTIAL)),1)
+  ifeq ($(strip $(PKG_RELRO)),1)
     TARGET_CFLAGS += -Wl,-z,relro
     TARGET_LDFLAGS += -zrelro
   endif
 endif
 ifdef CONFIG_PKG_RELRO_FULL
-  ifeq ($(strip $(PKG_RELRO_FULL)),1)
+  ifeq ($(strip $(PKG_RELRO)),1)
     TARGET_CFLAGS += -Wl,-z,now -Wl,-z,relro
     TARGET_LDFLAGS += -znow -zrelro
   endif