Update s2n to compile on FreeBSD (aws#2272)

colmmacc · Sep 8, 2020 · 0e4c9da · 0e4c9da
1 parent 536c77e
commit 0e4c9da
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -151,6 +151,9 @@ include(CheckCSourceCompiles)
 check_c_source_compiles("
     #include <execinfo.h>
     int main() {
+        void *array[20];
+        int backtrace_size = backtrace(array, 20);
+        backtrace_symbols(array, backtrace_size);
         return 0;
     }" S2N_HAVE_EXECINFO)
 

diff --git a/bin/s2nd.c b/bin/s2nd.c
@@ -747,7 +747,9 @@ int main(int argc, char *const *argv)
         struct sigaction sa;
 
         sa.sa_handler = SIG_IGN;
+#if defined(SA_NOCLDWAIT)
         sa.sa_flags = SA_NOCLDWAIT;
+#endif
         sigemptyset(&sa.sa_mask);
         sigaction(SIGCHLD, &sa, NULL);
     }

diff --git a/tests/unit/s2n_rfc5952_test.c b/tests/unit/s2n_rfc5952_test.c
@@ -17,6 +17,12 @@
 
 #include <arpa/inet.h>
 
+#if defined(__FreeBSD__)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
+
 #include "utils/s2n_rfc5952.h"
 
 int main(int argc, char **argv)

diff --git a/tests/unit/s2n_stacktrace_test.c b/tests/unit/s2n_stacktrace_test.c
@@ -27,6 +27,7 @@ int raises_error()
 int main(int argc, char **argv)
 {
     BEGIN_TEST();
+#ifdef S2N_HAVE_EXECINFO
     EXPECT_SUCCESS(s2n_stack_traces_enabled_set(true));
     struct s2n_stacktrace trace;
     /* If nothing has errored yet, we have no stacktrace */
@@ -48,4 +49,7 @@ int main(int argc, char **argv)
     /* Free the stacktrace to avoid memory leaks */
     EXPECT_SUCCESS(s2n_free_stacktrace());
     END_TEST();
+#else
+    END_TEST();
+#endif
 }
diff --git a/utils/s2n_mem.c b/utils/s2n_mem.c
@@ -14,7 +14,7 @@
  */
 
 #define  _DEFAULT_SOURCE 1
-#if !defined(__APPLE__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
 #include <features.h>
 #endif