update main-with-bazel from master branch

src/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)

src/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)