hardening

CMakeLists.txt

@@ -21,9 +21,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
 
 # validation
 add_definitions(-Wall -Wextra -std=c99 -Werror -pedantic)
+
 # hardening
 add_definitions(
-    -pie
     -fPIE
 
     # Broken GCC patch makes -fstack-protector-all not work
@@ -33,13 +33,10 @@ add_definitions(
     -fstack-protector-all
 
     -Wstack-protector
-    -D_FORTIFY_SOURCE=2
-    -Wa,--noexecstack
-    -Wl,-z,relro
-    -Wl,-z,now
-    -Wl,-z,noexecstack
 )
 
+set(CMAKE_EXE_LINKER_FLAGS "-pie -z relro -z now")
+
 # debugging
 add_definitions(-g)
 

cmake/modules/FindNACL.cmake

@@ -19,7 +19,7 @@ if (NOT NACL_INCLUDE_DIRS)
 
     ExternalProject_Add(NACL
         GIT_REPOSITORY git://github.com/cjdelisle/nacl.git
-        GIT_TAG 96761dcce8227ec130b6db395fcaae2c3d3eb166
+        GIT_TAG 4e44b37b89aa69356d713d27b4273e01b56d739c
         SOURCE_DIR "${CMAKE_BINARY_DIR}/nacl"
         BINARY_DIR "${CMAKE_BINARY_DIR}/nacl"
         INSTALL_COMMAND ""

util/test/CMakeLists.txt

@@ -17,7 +17,7 @@ message("-- Tests to run for " ${this_dir})
 add_definitions(-g)
 
 # Anything in this dir which ends with "test.c" is considered a test.
-file(GLOB tests "*test.c")
+file(GLOB tests "*_test.c")
 foreach(test_source_fullpath ${tests})
   string(REGEX REPLACE "^.*/" "" test_source ${test_source_fullpath})
   string(REPLACE "test.c" "test" test_bin ${test_source})
@@ -36,6 +36,6 @@ foreach(test_source_fullpath ${tests})
   string(REPLACE "benchmark.c" "benchmark" test_bin ${test_source})
   message("     " ${test_source})
   add_executable(${test_bin} ${test_source})
-  target_link_libraries(${test_bin} cjdmemory util crypto)
+  target_link_libraries(${test_bin} ${LIBEVENT2_LIBRARIES})
   add_test(${test_bin} ${test_bin})
 endforeach()

util/test/Endian_test.c

@@ -11,7 +11,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "crypto/Crypto.h"
 #include "util/Endian.h"
 
 #include <stdio.h>