| Index: runtime/bin/secure_socket_boringssl.cc
|
| diff --git a/runtime/bin/secure_socket_boringssl.cc b/runtime/bin/secure_socket_boringssl.cc
|
| index 68d68ee2ee0c71d99becb23c5f60780c82a47e8f..6e3b7fc73ce4afd60ca2334e15b170f482418de6 100644
|
| --- a/runtime/bin/secure_socket_boringssl.cc
|
| +++ b/runtime/bin/secure_socket_boringssl.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "platform/globals.h"
|
| #if defined(TARGET_OS_ANDROID) || defined(TARGET_OS_LINUX) || \
|
| - defined(TARGET_OS_WINDOWS)
|
| + defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_FUCHSIA)
|
|
|
| #include "bin/secure_socket.h"
|
| #include "bin/secure_socket_boringssl.h"
|
| @@ -766,6 +766,9 @@ void FUNCTION_NAME(SecurityContext_AlpnSupported)(Dart_NativeArguments args) {
|
|
|
| static void AddCompiledInCerts(SSLContext* context) {
|
| if (root_certificates_pem == NULL) {
|
| + if (SSL_LOG_STATUS) {
|
| + Log::Print("Missing compiled-in roots\n");
|
| + }
|
| return;
|
| }
|
| X509_STORE* store = SSL_CTX_get_cert_store(context->context());
|
| @@ -800,7 +803,7 @@ static void LoadRootCertFile(SSLContext* context, const char* file) {
|
| ThrowIOException(-1, "TlsException", "Failed to find root cert file");
|
| }
|
| int status = SSL_CTX_load_verify_locations(context->context(), file, NULL);
|
| - CheckStatus(status, "TlsException", "Failure trusting builtint roots");
|
| + CheckStatus(status, "TlsException", "Failure trusting builtin roots");
|
| if (SSL_LOG_STATUS) {
|
| Log::Print("Trusting roots from: %s\n", file);
|
| }
|
| @@ -815,7 +818,7 @@ static void LoadRootCertCache(SSLContext* context, const char* cache) {
|
| ThrowIOException(-1, "TlsException", "Failed to find root cert cache");
|
| }
|
| int status = SSL_CTX_load_verify_locations(context->context(), NULL, cache);
|
| - CheckStatus(status, "TlsException", "Failure trusting builtint roots");
|
| + CheckStatus(status, "TlsException", "Failure trusting builtin roots");
|
| if (SSL_LOG_STATUS) {
|
| Log::Print("Trusting roots from: %s\n", cache);
|
| }
|
| @@ -869,10 +872,10 @@ void FUNCTION_NAME(SecurityContext_TrustBuiltinRoots)(
|
|
|
| // Fall back on the compiled-in certs if the standard locations don't exist,
|
| // or we aren't on Linux.
|
| - AddCompiledInCerts(context);
|
| if (SSL_LOG_STATUS) {
|
| Log::Print("Trusting compiled-in roots\n");
|
| }
|
| + AddCompiledInCerts(context);
|
| }
|
|
|
|
|
|
|