From f51f273ee8eb67e1b2b36bb9ef576bd8ff8632bc Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Fri, 15 Sep 2017 14:54:02 -0400 Subject: [PATCH] Temporarily gate new Fuchsia APIs on CHROMIUM_ROLLING_MAGENTA_TO_ZIRCON. This is to keep Chromium building. Bug: chromium:765754 Change-Id: I312f747e27e53590a948305f80abc240bfd2063c Reviewed-on: https://boringssl-review.googlesource.com/20344 Reviewed-by: Aaron Green Reviewed-by: David Benjamin Commit-Queue: David Benjamin --- crypto/rand_extra/fuchsia.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/crypto/rand_extra/fuchsia.c b/crypto/rand_extra/fuchsia.c index ce8356c0a..9c3783fbd 100644 --- a/crypto/rand_extra/fuchsia.c +++ b/crypto/rand_extra/fuchsia.c @@ -19,7 +19,16 @@ #include #include +// TODO(davidben): Remove this once https://crbug.com/765754 is resolved. +#if defined(CHROMIUM_ROLLING_MAGENTA_TO_ZIRCON) #include +#else +#include +#define ZX_CPRNG_DRAW_MAX_LEN MX_CPRNG_DRAW_MAX_LEN +#define ZX_OK MX_OK +#define zx_status_t mx_status_t +#define zx_cprng_draw mx_cprng_draw +#endif #include "../fipsmodule/rand/internal.h"