commit a90044a4638c82c8078837532be1fd2e2217d09d
author Michael Ryleev <gmar@google.com> Fri May 05 09:44:33 2017 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri May 05 17:21:23 2017 +0000
tree 3c66ca454d7bf6514c7e9634e1d05ac8f9105a4e
parent b0521e38d27265d6de194e119de10dfe509f9845

Bypass building fipsmodule/rand/urandom.c when builing for Trusty

Change-Id: Icf1d6ec9d3fb33a124a9f61c75d29248a2582680
Reviewed-on: https://boringssl-review.googlesource.com/15964
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>

crypto/fipsmodule/rand/urandom.c

diff --git a/crypto/fipsmodule/rand/urandom.c b/crypto/fipsmodule/rand/urandom.c
index 7f76145..202f2a4 100644
--- a/crypto/fipsmodule/rand/urandom.c
+++ b/crypto/fipsmodule/rand/urandom.c
@@ -15,7 +15,7 @@
 #include <openssl/rand.h>
 
 #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \
-    !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE)
+    !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY)
 
 #include <assert.h>
 #include <errno.h>
@@ -291,4 +291,4 @@
 }
 
 #endif /* !OPENSSL_WINDOWS && !defined(OPENSSL_FUCHSIA) && \
-          !BORINGSSL_UNSAFE_DETERMINISTIC_MODE */
+          !BORINGSSL_UNSAFE_DETERMINISTIC_MODE && !OPENSSL_TRUSTY */