From 6738d477b8763abf38f6d1b60b6d799167ce9c8c Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Mon, 31 Jul 2023 13:19:54 -0700 Subject: [PATCH] Restore OPENSSL_RAND_TRUSTY With b/291102972 resolved, we can try this again. Bug: 629, b:291102972 Change-Id: Ic04d1855f185ead6ae2e151dcc56493afce40b4f Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/62105 Auto-Submit: David Benjamin Reviewed-by: Bob Beck Commit-Queue: Bob Beck --- crypto/fipsmodule/rand/internal.h | 5 +---- include/openssl/base.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/crypto/fipsmodule/rand/internal.h b/crypto/fipsmodule/rand/internal.h index 029e0f7e6..91bbe5897 100644 --- a/crypto/fipsmodule/rand/internal.h +++ b/crypto/fipsmodule/rand/internal.h @@ -29,10 +29,7 @@ extern "C" { #if defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) #define OPENSSL_RAND_DETERMINISTIC #elif defined(OPENSSL_TRUSTY) -// TODO(b/291102972): This should define OPENSSL_RAND_TRUSTY to activate the -// Trusty RNG implementation. However, due to a different, non-Trusty target -// incorrectly defining __TRUSTY__, things will break if we follow our standard -// pattern here. +#define OPENSSL_RAND_TRUSTY #elif defined(OPENSSL_WINDOWS) #define OPENSSL_RAND_WINDOWS #elif defined(OPENSSL_LINUX) diff --git a/include/openssl/base.h b/include/openssl/base.h index 87ffe214b..97a17bb3a 100644 --- a/include/openssl/base.h +++ b/include/openssl/base.h @@ -108,7 +108,7 @@ extern "C" { // A consumer may use this symbol in the preprocessor to temporarily build // against multiple revisions of BoringSSL at the same time. It is not // recommended to do so for longer than is necessary. -#define BORINGSSL_API_VERSION 25 +#define BORINGSSL_API_VERSION 26 #if defined(BORINGSSL_SHARED_LIBRARY)