diff options
author | ng0 <ng0@n0.is> | 2019-08-18 10:18:58 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-08-18 10:18:58 +0000 |
commit | 86832243cf904b0bbae31471874b7abdf90e49d0 (patch) | |
tree | 6952fc1a8909a4457f7647df36db6112d54b0dfd | |
parent | 5a2872c15f0fd2ceebdb8b5f959021698ddb44f0 (diff) | |
parent | 316f6ab358269d73e62b340b6cd62597290a498b (diff) | |
download | libmicrohttpd-86832243cf904b0bbae31471874b7abdf90e49d0.tar.gz libmicrohttpd-86832243cf904b0bbae31471874b7abdf90e49d0.zip |
Merge remote-tracking branch 'origin/master' into dev/ng0/gsoc2019
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 30 |
2 files changed, 34 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | Fri 02 Aug 2019 00:00:00 PM UTC | 1 | Fri 18 Aug 2019 00:00:00 PM UTC |
2 | Fixes and optimizations for the setsockopt handling: | 2 | Fixes and optimizations for the setsockopt handling: |
3 | * Added: MHD_UPGRADE_ACTION_CORK_ON and MHD_UPGRADE_ACTION_CORK_OFF | 3 | * Added: MHD_UPGRADE_ACTION_CORK_ON and MHD_UPGRADE_ACTION_CORK_OFF |
4 | to enum MHD_UpgradeAction (turn corking on/off on the underlying | 4 | to enum MHD_UpgradeAction (turn corking on/off on the underlying |
@@ -9,6 +9,10 @@ Fri 02 Aug 2019 00:00:00 PM UTC | |||
9 | this adds selective usage of MSG_MORE, NODELAY, TCP_NOPUSH, | 9 | this adds selective usage of MSG_MORE, NODELAY, TCP_NOPUSH, |
10 | TCP_CORK. -ng0 | 10 | TCP_CORK. -ng0 |
11 | 11 | ||
12 | Fri 09 Aug 2019 10:07:27 AM CEST | ||
13 | Copy compiler and linker hardening flags from GNUnet (updating | ||
14 | configure.ac). -CG | ||
15 | |||
12 | Thu 01 Aug 2019 01:23:36 PM CEST | 16 | Thu 01 Aug 2019 01:23:36 PM CEST |
13 | Releasing libmicrohttpd 0.9.66. -CG | 17 | Releasing libmicrohttpd 0.9.66. -CG |
14 | 18 | ||
diff --git a/configure.ac b/configure.ac index 1a0870b7..37ae0fe6 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -81,6 +81,34 @@ AM_CONDITIONAL([HAVE_PO], [ test "$have_po" = yes ]) | |||
81 | 81 | ||
82 | 82 | ||
83 | 83 | ||
84 | |||
85 | # Adam shostack suggests the following for Windows: | ||
86 | # -D_FORTIFY_SOURCE=2 -fstack-protector-all | ||
87 | AC_ARG_ENABLE(gcc-hardening, | ||
88 | AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks), | ||
89 | [AS_IF([test x$enableval = xyes],[ | ||
90 | CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all" | ||
91 | CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector" | ||
92 | CFLAGS="$CFLAGS --param ssp-buffer-size=1" | ||
93 | LDFLAGS="$LDFLAGS -pie" | ||
94 | ])]) | ||
95 | |||
96 | # Linker hardening options | ||
97 | # Currently these options are ELF specific - you can't use this with MacOSX | ||
98 | AC_ARG_ENABLE(linker-hardening, | ||
99 | AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups), | ||
100 | [AS_IF([test x$enableval = xyes], | ||
101 | [LDFLAGS="$LDFLAGS -z relro -z now"])]) | ||
102 | |||
103 | |||
104 | AC_ARG_ENABLE(sanitizer, | ||
105 | AS_HELP_STRING(--enable-sanitizer, enable Address Sanitizer and Undefined Behavior Sanitizer), | ||
106 | [AS_IF([test x$enableval = xyes],[ | ||
107 | LDFLAGS="$CFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer" | ||
108 | ])]) | ||
109 | |||
110 | |||
111 | |||
84 | # Workaround for libgcrypt | 112 | # Workaround for libgcrypt |
85 | AS_IF([[test "x$lt_sysroot" != "x" && test "x$SYSROOT" = "x"]], [[SYSROOT="$lt_sysroot"]]) | 113 | AS_IF([[test "x$lt_sysroot" != "x" && test "x$SYSROOT" = "x"]], [[SYSROOT="$lt_sysroot"]]) |
86 | 114 | ||
@@ -812,7 +840,7 @@ AC_INCLUDES_DEFAULT | |||
812 | ] | 840 | ] |
813 | ) | 841 | ) |
814 | 842 | ||
815 | AC_CHECK_MEMBERS([struct sockaddr_in.sin_len, struct sockaddr_in6.sin6_len, | 843 | AC_CHECK_MEMBERS([struct sockaddr_in.sin_len, struct sockaddr_in6.sin6_len, |
816 | struct sockaddr_storage.ss_len], | 844 | struct sockaddr_storage.ss_len], |
817 | [], [], | 845 | [], [], |
818 | [ | 846 | [ |