[GNUnet-SVN] r18714 - in gnunet: . src/dht

[gnunet]

Author: grothoff
Date: 2011-12-20 10:20:02 +0100 (Tue, 20 Dec 2011)
New Revision: 18714

Modified:
   gnunet/AUTHORS
   gnunet/configure.ac
   gnunet/src/dht/test_dht_2dtorus.conf
Log:
Adding optional compiler and linker hardening options as per suggestion from 
Jacob

Modified: gnunet/AUTHORS
===================================================================
--- gnunet/AUTHORS      2011-12-20 09:11:36 UTC (rev 18713)
+++ gnunet/AUTHORS      2011-12-20 09:20:02 UTC (rev 18714)
@@ -38,6 +38,7 @@
 Igor Wronsky <address@hidden>
 Ioana Patrascu <address@hidden>
 <address@hidden>
+Jacob Appelbaum <address@hidden>
 Jake Dust <address@hidden>
 James Blackwell <address@hidden>
 Jean-Luc Cooke <address@hidden> [ SHA-512]

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2011-12-20 09:11:36 UTC (rev 18713)
+++ gnunet/configure.ac 2011-12-20 09:20:02 UTC (rev 18714)
@@ -201,6 +201,26 @@
   AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
 
+# Adam shostack suggests the following for Windows:
+# -D_FORTIFY_SOURCE=2 -fstack-protector-all
+AC_ARG_ENABLE(gcc-hardening,
+   AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks),
+[if test x$enableval = xyes; then
+    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector-all"
+    CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector"
+    CFLAGS="$CFLAGS --param ssp-buffer-size=1"
+    LDFLAGS="$LDFLAGS -pie"
+fi])
+
+# Linker hardening options
+# Currently these options are ELF specific - you can't use this with MacOSX
+AC_ARG_ENABLE(linker-hardening,
+  AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups),
+[if test x$enableval = xyes; then
+   LDFLAGS="$LDFLAGS -z relro -z now"
+fi])
+
+
 extra_logging=GNUNET_NO
 AC_ARG_ENABLE([logging],
    AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. 
Possible values: yes,no,verbose,veryverbose ('yes' is the default)]),

Modified: gnunet/src/dht/test_dht_2dtorus.conf
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.conf        2011-12-20 09:11:36 UTC (rev 
18713)
+++ gnunet/src/dht/test_dht_2dtorus.conf        2011-12-20 09:20:02 UTC (rev 
18714)
@@ -49,7 +49,7 @@
 PORT = 10004
 
 [testing]
-NUM_PEERS = 16
+NUM_PEERS = 256
 WEAKRANDOM = YES
 TOPOLOGY = 2D_TORUS
 CONNECT_TOPOLOGY = NONE