diff --git a/BUILD b/BUILD
index e25db3b0fe4..4681666abaa 100644
--- a/BUILD
+++ b/BUILD
@@ -5431,13 +5431,13 @@ grpc_cc_library(
srcs = [
"src/core/lib/security/credentials/tls/tls_utils.cc",
"src/core/lib/security/security_connector/load_system_roots_fallback.cc",
- "src/core/lib/security/security_connector/load_system_roots_linux.cc",
+ "src/core/lib/security/security_connector/load_system_roots_supported.cc",
"src/core/lib/security/util/json_util.cc",
],
hdrs = [
"src/core/lib/security/credentials/tls/tls_utils.h",
"src/core/lib/security/security_connector/load_system_roots.h",
- "src/core/lib/security/security_connector/load_system_roots_linux.h",
+ "src/core/lib/security/security_connector/load_system_roots_supported.h",
"src/core/lib/security/util/json_util.h",
],
external_deps = [
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2cf5e5be6b..74187b274fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1074,7 +1074,6 @@ if(gRPC_BUILD_TESTS)
add_dependencies(buildtests_cxx latch_test)
add_dependencies(buildtests_cxx lb_get_cpu_stats_test)
add_dependencies(buildtests_cxx lb_load_data_store_test)
- add_dependencies(buildtests_cxx linux_system_roots_test)
add_dependencies(buildtests_cxx log_test)
add_dependencies(buildtests_cxx loop_test)
add_dependencies(buildtests_cxx match_test)
@@ -1161,6 +1160,7 @@ if(gRPC_BUILD_TESTS)
endif()
add_dependencies(buildtests_cxx streams_not_seen_test)
add_dependencies(buildtests_cxx string_ref_test)
+ add_dependencies(buildtests_cxx system_roots_test)
add_dependencies(buildtests_cxx table_test)
add_dependencies(buildtests_cxx test_core_event_engine_slice_buffer_test)
add_dependencies(buildtests_cxx test_core_gprpp_time_test)
@@ -2202,7 +2202,7 @@ add_library(grpc
src/core/lib/security/security_connector/fake/fake_security_connector.cc
src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
src/core/lib/security/security_connector/load_system_roots_fallback.cc
- src/core/lib/security/security_connector/load_system_roots_linux.cc
+ src/core/lib/security/security_connector/load_system_roots_supported.cc
src/core/lib/security/security_connector/local/local_security_connector.cc
src/core/lib/security/security_connector/security_connector.cc
src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
@@ -2794,7 +2794,7 @@ add_library(grpc_unsecure
src/core/lib/security/security_connector/fake/fake_security_connector.cc
src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
src/core/lib/security/security_connector/load_system_roots_fallback.cc
- src/core/lib/security/security_connector/load_system_roots_linux.cc
+ src/core/lib/security/security_connector/load_system_roots_supported.cc
src/core/lib/security/security_connector/security_connector.cc
src/core/lib/security/transport/client_auth_filter.cc
src/core/lib/security/transport/secure_endpoint.cc
@@ -12955,41 +12955,6 @@ target_link_libraries(lb_load_data_store_test
)
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(linux_system_roots_test
- test/core/security/linux_system_roots_test.cc
- third_party/googletest/googletest/src/gtest-all.cc
- third_party/googletest/googlemock/src/gmock-all.cc
-)
-
-target_include_directories(linux_system_roots_test
- PRIVATE
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/include
- ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
- ${_gRPC_RE2_INCLUDE_DIR}
- ${_gRPC_SSL_INCLUDE_DIR}
- ${_gRPC_UPB_GENERATED_DIR}
- ${_gRPC_UPB_GRPC_GENERATED_DIR}
- ${_gRPC_UPB_INCLUDE_DIR}
- ${_gRPC_XXHASH_INCLUDE_DIR}
- ${_gRPC_ZLIB_INCLUDE_DIR}
- third_party/googletest/googletest/include
- third_party/googletest/googletest
- third_party/googletest/googlemock/include
- third_party/googletest/googlemock
- ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(linux_system_roots_test
- ${_gRPC_PROTOBUF_LIBRARIES}
- ${_gRPC_ALLTARGETS_LIBRARIES}
- grpc_test_util
-)
-
-
endif()
if(gRPC_BUILD_TESTS)
@@ -16180,6 +16145,41 @@ target_link_libraries(string_ref_test
)
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(system_roots_test
+ test/core/security/system_roots_test.cc
+ third_party/googletest/googletest/src/gtest-all.cc
+ third_party/googletest/googlemock/src/gmock-all.cc
+)
+
+target_include_directories(system_roots_test
+ PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/include
+ ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+ ${_gRPC_RE2_INCLUDE_DIR}
+ ${_gRPC_SSL_INCLUDE_DIR}
+ ${_gRPC_UPB_GENERATED_DIR}
+ ${_gRPC_UPB_GRPC_GENERATED_DIR}
+ ${_gRPC_UPB_INCLUDE_DIR}
+ ${_gRPC_XXHASH_INCLUDE_DIR}
+ ${_gRPC_ZLIB_INCLUDE_DIR}
+ third_party/googletest/googletest/include
+ third_party/googletest/googletest
+ third_party/googletest/googlemock/include
+ third_party/googletest/googlemock
+ ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(system_roots_test
+ ${_gRPC_PROTOBUF_LIBRARIES}
+ ${_gRPC_ALLTARGETS_LIBRARIES}
+ grpc_test_util
+)
+
+
endif()
if(gRPC_BUILD_TESTS)
diff --git a/Makefile b/Makefile
index 6e0e43893a0..3bb67dc4755 100644
--- a/Makefile
+++ b/Makefile
@@ -1590,7 +1590,7 @@ LIBGRPC_SRC = \
src/core/lib/security/security_connector/fake/fake_security_connector.cc \
src/core/lib/security/security_connector/insecure/insecure_security_connector.cc \
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
- src/core/lib/security/security_connector/load_system_roots_linux.cc \
+ src/core/lib/security/security_connector/load_system_roots_supported.cc \
src/core/lib/security/security_connector/local/local_security_connector.cc \
src/core/lib/security/security_connector/security_connector.cc \
src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
@@ -2022,7 +2022,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/lib/security/security_connector/fake/fake_security_connector.cc \
src/core/lib/security/security_connector/insecure/insecure_security_connector.cc \
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
- src/core/lib/security/security_connector/load_system_roots_linux.cc \
+ src/core/lib/security/security_connector/load_system_roots_supported.cc \
src/core/lib/security/security_connector/security_connector.cc \
src/core/lib/security/transport/client_auth_filter.cc \
src/core/lib/security/transport/secure_endpoint.cc \
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 63d9629a150..5897dbb76fd 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -906,7 +906,7 @@ libs:
- src/core/lib/security/security_connector/fake/fake_security_connector.h
- src/core/lib/security/security_connector/insecure/insecure_security_connector.h
- src/core/lib/security/security_connector/load_system_roots.h
- - src/core/lib/security/security_connector/load_system_roots_linux.h
+ - src/core/lib/security/security_connector/load_system_roots_supported.h
- src/core/lib/security/security_connector/local/local_security_connector.h
- src/core/lib/security/security_connector/security_connector.h
- src/core/lib/security/security_connector/ssl/ssl_security_connector.h
@@ -1568,7 +1568,7 @@ libs:
- src/core/lib/security/security_connector/fake/fake_security_connector.cc
- src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
- src/core/lib/security/security_connector/load_system_roots_fallback.cc
- - src/core/lib/security/security_connector/load_system_roots_linux.cc
+ - src/core/lib/security/security_connector/load_system_roots_supported.cc
- src/core/lib/security/security_connector/local/local_security_connector.cc
- src/core/lib/security/security_connector/security_connector.cc
- src/core/lib/security/security_connector/ssl/ssl_security_connector.cc
@@ -2086,7 +2086,7 @@ libs:
- src/core/lib/security/security_connector/fake/fake_security_connector.h
- src/core/lib/security/security_connector/insecure/insecure_security_connector.h
- src/core/lib/security/security_connector/load_system_roots.h
- - src/core/lib/security/security_connector/load_system_roots_linux.h
+ - src/core/lib/security/security_connector/load_system_roots_supported.h
- src/core/lib/security/security_connector/security_connector.h
- src/core/lib/security/transport/auth_filters.h
- src/core/lib/security/transport/secure_endpoint.h
@@ -2391,7 +2391,7 @@ libs:
- src/core/lib/security/security_connector/fake/fake_security_connector.cc
- src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
- src/core/lib/security/security_connector/load_system_roots_fallback.cc
- - src/core/lib/security/security_connector/load_system_roots_linux.cc
+ - src/core/lib/security/security_connector/load_system_roots_supported.cc
- src/core/lib/security/security_connector/security_connector.cc
- src/core/lib/security/transport/client_auth_filter.cc
- src/core/lib/security/transport/secure_endpoint.cc
@@ -6795,15 +6795,6 @@ targets:
deps:
- grpc++
- grpc_test_util
-- name: linux_system_roots_test
- gtest: true
- build: test
- language: c++
- headers: []
- src:
- - test/core/security/linux_system_roots_test.cc
- deps:
- - grpc_test_util
- name: log_test
gtest: true
build: test
@@ -8183,6 +8174,15 @@ targets:
- grpc++
- grpc_test_util
uses_polling: false
+- name: system_roots_test
+ gtest: true
+ build: test
+ language: c++
+ headers: []
+ src:
+ - test/core/security/system_roots_test.cc
+ deps:
+ - grpc_test_util
- name: table_test
gtest: true
build: test
diff --git a/config.m4 b/config.m4
index e669c0ae2be..b65f935d963 100644
--- a/config.m4
+++ b/config.m4
@@ -658,7 +658,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/lib/security/security_connector/fake/fake_security_connector.cc \
src/core/lib/security/security_connector/insecure/insecure_security_connector.cc \
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
- src/core/lib/security/security_connector/load_system_roots_linux.cc \
+ src/core/lib/security/security_connector/load_system_roots_supported.cc \
src/core/lib/security/security_connector/local/local_security_connector.cc \
src/core/lib/security/security_connector/security_connector.cc \
src/core/lib/security/security_connector/ssl/ssl_security_connector.cc \
diff --git a/config.w32 b/config.w32
index fbb1edafdc0..f840f0f950e 100644
--- a/config.w32
+++ b/config.w32
@@ -624,7 +624,7 @@ if (PHP_GRPC != "no") {
"src\\core\\lib\\security\\security_connector\\fake\\fake_security_connector.cc " +
"src\\core\\lib\\security\\security_connector\\insecure\\insecure_security_connector.cc " +
"src\\core\\lib\\security\\security_connector\\load_system_roots_fallback.cc " +
- "src\\core\\lib\\security\\security_connector\\load_system_roots_linux.cc " +
+ "src\\core\\lib\\security\\security_connector\\load_system_roots_supported.cc " +
"src\\core\\lib\\security\\security_connector\\local\\local_security_connector.cc " +
"src\\core\\lib\\security\\security_connector\\security_connector.cc " +
"src\\core\\lib\\security\\security_connector\\ssl\\ssl_security_connector.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index b9517dd4c79..63cd69f0c71 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -864,7 +864,7 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/fake/fake_security_connector.h',
'src/core/lib/security/security_connector/insecure/insecure_security_connector.h',
'src/core/lib/security/security_connector/load_system_roots.h',
- 'src/core/lib/security/security_connector/load_system_roots_linux.h',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.h',
'src/core/lib/security/security_connector/local/local_security_connector.h',
'src/core/lib/security/security_connector/security_connector.h',
'src/core/lib/security/security_connector/ssl/ssl_security_connector.h',
@@ -1684,7 +1684,7 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/fake/fake_security_connector.h',
'src/core/lib/security/security_connector/insecure/insecure_security_connector.h',
'src/core/lib/security/security_connector/load_system_roots.h',
- 'src/core/lib/security/security_connector/load_system_roots_linux.h',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.h',
'src/core/lib/security/security_connector/local/local_security_connector.h',
'src/core/lib/security/security_connector/security_connector.h',
'src/core/lib/security/security_connector/ssl/ssl_security_connector.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 8dd7c2b4790..bf68c6ccfe1 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1422,8 +1422,8 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/insecure/insecure_security_connector.h',
'src/core/lib/security/security_connector/load_system_roots.h',
'src/core/lib/security/security_connector/load_system_roots_fallback.cc',
- 'src/core/lib/security/security_connector/load_system_roots_linux.cc',
- 'src/core/lib/security/security_connector/load_system_roots_linux.h',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.cc',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.h',
'src/core/lib/security/security_connector/local/local_security_connector.cc',
'src/core/lib/security/security_connector/local/local_security_connector.h',
'src/core/lib/security/security_connector/security_connector.cc',
@@ -2285,7 +2285,7 @@ Pod::Spec.new do |s|
'src/core/lib/security/security_connector/fake/fake_security_connector.h',
'src/core/lib/security/security_connector/insecure/insecure_security_connector.h',
'src/core/lib/security/security_connector/load_system_roots.h',
- 'src/core/lib/security/security_connector/load_system_roots_linux.h',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.h',
'src/core/lib/security/security_connector/local/local_security_connector.h',
'src/core/lib/security/security_connector/security_connector.h',
'src/core/lib/security/security_connector/ssl/ssl_security_connector.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index fda6eff3309..3f36a4949d2 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1335,8 +1335,8 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/security/security_connector/insecure/insecure_security_connector.h )
s.files += %w( src/core/lib/security/security_connector/load_system_roots.h )
s.files += %w( src/core/lib/security/security_connector/load_system_roots_fallback.cc )
- s.files += %w( src/core/lib/security/security_connector/load_system_roots_linux.cc )
- s.files += %w( src/core/lib/security/security_connector/load_system_roots_linux.h )
+ s.files += %w( src/core/lib/security/security_connector/load_system_roots_supported.cc )
+ s.files += %w( src/core/lib/security/security_connector/load_system_roots_supported.h )
s.files += %w( src/core/lib/security/security_connector/local/local_security_connector.cc )
s.files += %w( src/core/lib/security/security_connector/local/local_security_connector.h )
s.files += %w( src/core/lib/security/security_connector/security_connector.cc )
diff --git a/grpc.gyp b/grpc.gyp
index 2ba108cea9d..877e5dd2a86 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -947,7 +947,7 @@
'src/core/lib/security/security_connector/fake/fake_security_connector.cc',
'src/core/lib/security/security_connector/insecure/insecure_security_connector.cc',
'src/core/lib/security/security_connector/load_system_roots_fallback.cc',
- 'src/core/lib/security/security_connector/load_system_roots_linux.cc',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.cc',
'src/core/lib/security/security_connector/local/local_security_connector.cc',
'src/core/lib/security/security_connector/security_connector.cc',
'src/core/lib/security/security_connector/ssl/ssl_security_connector.cc',
@@ -1371,7 +1371,7 @@
'src/core/lib/security/security_connector/fake/fake_security_connector.cc',
'src/core/lib/security/security_connector/insecure/insecure_security_connector.cc',
'src/core/lib/security/security_connector/load_system_roots_fallback.cc',
- 'src/core/lib/security/security_connector/load_system_roots_linux.cc',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.cc',
'src/core/lib/security/security_connector/security_connector.cc',
'src/core/lib/security/transport/client_auth_filter.cc',
'src/core/lib/security/transport/secure_endpoint.cc',
diff --git a/package.xml b/package.xml
index fcfc02942e0..8a6cf3c1933 100644
--- a/package.xml
+++ b/package.xml
@@ -1317,8 +1317,8 @@
-
-
+
+
diff --git a/src/core/lib/security/security_connector/load_system_roots_fallback.cc b/src/core/lib/security/security_connector/load_system_roots_fallback.cc
index e377411a5d1..5d128ea96f7 100644
--- a/src/core/lib/security/security_connector/load_system_roots_fallback.cc
+++ b/src/core/lib/security/security_connector/load_system_roots_fallback.cc
@@ -22,7 +22,8 @@
#include "src/core/lib/security/security_connector/load_system_roots.h"
-#if !defined(GPR_LINUX) && !defined(GPR_ANDROID) && !defined(GPR_FREEBSD)
+#if !defined(GPR_LINUX) && !defined(GPR_ANDROID) && !defined(GPR_FREEBSD) && \
+ !defined(GPR_APPLE)
namespace grpc_core {
@@ -30,4 +31,4 @@ grpc_slice LoadSystemRootCerts() { return grpc_empty_slice(); }
} // namespace grpc_core
-#endif /* !(GPR_LINUX || GPR_ANDROID || GPR_FREEBSD) */
+#endif /* !(GPR_LINUX || GPR_ANDROID || GPR_FREEBSD || GPR_APPLE) */
diff --git a/src/core/lib/security/security_connector/load_system_roots_linux.cc b/src/core/lib/security/security_connector/load_system_roots_supported.cc
similarity index 95%
rename from src/core/lib/security/security_connector/load_system_roots_linux.cc
rename to src/core/lib/security/security_connector/load_system_roots_supported.cc
index abbce1fec3a..125a62ee785 100644
--- a/src/core/lib/security/security_connector/load_system_roots_linux.cc
+++ b/src/core/lib/security/security_connector/load_system_roots_supported.cc
@@ -18,11 +18,12 @@
#include
-#include "src/core/lib/security/security_connector/load_system_roots_linux.h"
+#include "src/core/lib/security/security_connector/load_system_roots_supported.h"
#include
-#if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD)
+#if defined(GPR_LINUX) || defined(GPR_ANDROID) || defined(GPR_FREEBSD) || \
+ defined(GPR_APPLE)
#include
#include
@@ -63,7 +64,10 @@ const char* kCertDirectories[] = {
const char* kCertFiles[] = {"/etc/ssl/cert.pem",
"/usr/local/share/certs/ca-root-nss.crt"};
const char* kCertDirectories[] = {""};
-#endif // GPR_FREEBSD
+#elif defined(GPR_APPLE) // endif GPR_FREEBSD
+const char* kCertFiles[] = {"/etc/ssl/cert.pem"};
+const char* kCertDirectories[] = {""};
+#endif // GPR_APPLE
grpc_slice GetSystemRootCerts() {
grpc_slice valid_bundle_slice = grpc_empty_slice();
@@ -173,4 +177,4 @@ grpc_slice LoadSystemRootCerts() {
} // namespace grpc_core
-#endif /* GPR_LINUX || GPR_ANDROID || GPR_FREEBSD */
+#endif /* GPR_LINUX || GPR_ANDROID || GPR_FREEBSD || GPR_APPLE */
diff --git a/src/core/lib/security/security_connector/load_system_roots_linux.h b/src/core/lib/security/security_connector/load_system_roots_supported.h
similarity index 89%
rename from src/core/lib/security/security_connector/load_system_roots_linux.h
rename to src/core/lib/security/security_connector/load_system_roots_supported.h
index 758bdd97d28..30997ade03e 100644
--- a/src/core/lib/security/security_connector/load_system_roots_linux.h
+++ b/src/core/lib/security/security_connector/load_system_roots_supported.h
@@ -16,14 +16,14 @@
*
*/
-#ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_LINUX_H
-#define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_LINUX_H
+#ifndef GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_SUPPORTED_H
+#define GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_SUPPORTED_H
#include
#include
-#if defined(GPR_LINUX) || defined(GPR_FREEBSD)
+#if defined(GPR_LINUX) || defined(GPR_FREEBSD) || defined(GPR_APPLE)
namespace grpc_core {
@@ -41,6 +41,6 @@ void GetAbsoluteFilePath(const char* valid_file_dir,
} // namespace grpc_core
-#endif /* GPR_LINUX || GPR_FREEBSD */
-#endif /* GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_LINUX_H \
+#endif /* GPR_LINUX || GPR_FREEBSD || GPR_APPLE */
+#endif /* GRPC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_LOAD_SYSTEM_ROOTS_SUPPORTED_H \
*/
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 3a6b25838db..4a3f8ba865a 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -633,7 +633,7 @@ CORE_SOURCE_FILES = [
'src/core/lib/security/security_connector/fake/fake_security_connector.cc',
'src/core/lib/security/security_connector/insecure/insecure_security_connector.cc',
'src/core/lib/security/security_connector/load_system_roots_fallback.cc',
- 'src/core/lib/security/security_connector/load_system_roots_linux.cc',
+ 'src/core/lib/security/security_connector/load_system_roots_supported.cc',
'src/core/lib/security/security_connector/local/local_security_connector.cc',
'src/core/lib/security/security_connector/security_connector.cc',
'src/core/lib/security/security_connector/ssl/ssl_security_connector.cc',
diff --git a/test/core/security/BUILD b/test/core/security/BUILD
index 2ad399540e8..cd13b83094c 100644
--- a/test/core/security/BUILD
+++ b/test/core/security/BUILD
@@ -174,8 +174,8 @@ grpc_cc_test(
)
grpc_cc_test(
- name = "linux_system_roots_test",
- srcs = ["linux_system_roots_test.cc"],
+ name = "system_roots_test",
+ srcs = ["system_roots_test.cc"],
data = [
"//test/core/security/etc:bundle.pem",
"//test/core/security/etc:test_roots/cert1.pem",
diff --git a/test/core/security/linux_system_roots_test.cc b/test/core/security/system_roots_test.cc
similarity index 93%
rename from test/core/security/linux_system_roots_test.cc
rename to test/core/security/system_roots_test.cc
index e48dd573661..e34804783f5 100644
--- a/test/core/security/linux_system_roots_test.cc
+++ b/test/core/security/system_roots_test.cc
@@ -20,7 +20,7 @@
#include
-#if defined(GPR_LINUX) || defined(GPR_FREEBSD)
+#if defined(GPR_LINUX) || defined(GPR_FREEBSD) || defined(GPR_APPLE)
#include
#include
@@ -36,7 +36,7 @@
#include "src/core/lib/iomgr/load_file.h"
#include "src/core/lib/security/context/security_context.h"
#include "src/core/lib/security/security_connector/load_system_roots.h"
-#include "src/core/lib/security/security_connector/load_system_roots_linux.h"
+#include "src/core/lib/security/security_connector/load_system_roots_supported.h"
#include "src/core/lib/security/security_connector/security_connector.h"
#include "src/core/lib/slice/slice_string_helpers.h"
#include "src/core/tsi/ssl_transport_security.h"
@@ -95,8 +95,8 @@ int main(int argc, char** argv) {
#else
int main() {
printf(
- "*** WARNING: this test is only supported on Linux and FreeBSD systems"
- "***\n");
+ "*** WARNING: this test is only supported on Linux, FreeBSD, and MacOS"
+ "systems ***\n");
return 0;
}
-#endif // GPR_LINUX || GPR_FREEBSD
+#endif // GPR_LINUX || GPR_FREEBSD || GPR_APPLE
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 4f4f38203b5..8effb9fb152 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -2318,8 +2318,8 @@ src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
src/core/lib/security/security_connector/insecure/insecure_security_connector.h \
src/core/lib/security/security_connector/load_system_roots.h \
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
-src/core/lib/security/security_connector/load_system_roots_linux.cc \
-src/core/lib/security/security_connector/load_system_roots_linux.h \
+src/core/lib/security/security_connector/load_system_roots_supported.cc \
+src/core/lib/security/security_connector/load_system_roots_supported.h \
src/core/lib/security/security_connector/local/local_security_connector.cc \
src/core/lib/security/security_connector/local/local_security_connector.h \
src/core/lib/security/security_connector/security_connector.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 18d1b78c778..70e583ac1ee 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -2112,8 +2112,8 @@ src/core/lib/security/security_connector/insecure/insecure_security_connector.cc
src/core/lib/security/security_connector/insecure/insecure_security_connector.h \
src/core/lib/security/security_connector/load_system_roots.h \
src/core/lib/security/security_connector/load_system_roots_fallback.cc \
-src/core/lib/security/security_connector/load_system_roots_linux.cc \
-src/core/lib/security/security_connector/load_system_roots_linux.h \
+src/core/lib/security/security_connector/load_system_roots_supported.cc \
+src/core/lib/security/security_connector/load_system_roots_supported.h \
src/core/lib/security/security_connector/local/local_security_connector.cc \
src/core/lib/security/security_connector/local/local_security_connector.h \
src/core/lib/security/security_connector/security_connector.cc \
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 0309447b4c6..08aa509ea07 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -5187,30 +5187,6 @@
],
"uses_polling": true
},
- {
- "args": [],
- "benchmark": false,
- "ci_platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "cpu_cost": 1.0,
- "exclude_configs": [],
- "exclude_iomgrs": [],
- "flaky": false,
- "gtest": true,
- "language": "c++",
- "name": "linux_system_roots_test",
- "platforms": [
- "linux",
- "mac",
- "posix",
- "windows"
- ],
- "uses_polling": true
- },
{
"args": [],
"benchmark": false,
@@ -6853,6 +6829,30 @@
],
"uses_polling": false
},
+ {
+ "args": [],
+ "benchmark": false,
+ "ci_platforms": [
+ "linux",
+ "mac",
+ "posix",
+ "windows"
+ ],
+ "cpu_cost": 1.0,
+ "exclude_configs": [],
+ "exclude_iomgrs": [],
+ "flaky": false,
+ "gtest": true,
+ "language": "c++",
+ "name": "system_roots_test",
+ "platforms": [
+ "linux",
+ "mac",
+ "posix",
+ "windows"
+ ],
+ "uses_polling": true
+ },
{
"args": [],
"benchmark": false,