| commit | 6b6b66bacd089ae4faf8c22fdc47fe0a9fe6ef50 | [log] [tgz] |
|---|---|---|
| author | Pete Bentley <prb@google.com> | Wed Sep 30 17:55:55 2020 +0100 |
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | Wed Sep 30 18:39:54 2020 +0000 |
| tree | 145c9f3ae7c56769e69120ee89b82b0a5f1d964a | |
| parent | 67818bea6690a230e2f42e8a588e0f54949bbbf1 [diff] |
Disable fork detection on Trusty. Trusty doesn't have madvise() or sysconf() and more importantly, doesn't have fork() (confirmed chatting to ncbray), so the no-op #if branch in fork_detect.c seems appropriate. Change-Id: I41b41e79d59919bae6c6ece0e0efd3872105e9b1 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/43204 Commit-Queue: Pete Bentley <prb@google.com> Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/fipsmodule/rand/fork_detect.c b/crypto/fipsmodule/rand/fork_detect.c index 8dd2c95..96cb595 100644 --- a/crypto/fipsmodule/rand/fork_detect.c +++ b/crypto/fipsmodule/rand/fork_detect.c
@@ -20,7 +20,7 @@ #include "fork_detect.h" -#if defined(OPENSSL_LINUX) +#if defined(OPENSSL_LINUX) && !defined(OPENSSL_TRUSTY) #include <sys/mman.h> #include <unistd.h> #include <stdlib.h>