mirror of
https://github.com/klzgrad/naiveproxy.git
synced 2024-11-28 00:06:09 +03:00
cert: Use builtin verifier on Android and Linux
This commit is contained in:
parent
a11f84be92
commit
e0b4e80a2c
@ -1158,7 +1158,6 @@ component("net") {
|
|||||||
"android/network_library.h",
|
"android/network_library.h",
|
||||||
"android/traffic_stats.h",
|
"android/traffic_stats.h",
|
||||||
"cert/cert_verify_proc_android.h",
|
"cert/cert_verify_proc_android.h",
|
||||||
"cert/test_root_certs_android.cc",
|
|
||||||
"proxy_resolution/proxy_config_service_android.h",
|
"proxy_resolution/proxy_config_service_android.h",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -1201,6 +1200,7 @@ component("net") {
|
|||||||
"base/network_interfaces_linux.cc",
|
"base/network_interfaces_linux.cc",
|
||||||
"base/network_interfaces_linux.h",
|
"base/network_interfaces_linux.h",
|
||||||
"base/platform_mime_util_linux.cc",
|
"base/platform_mime_util_linux.cc",
|
||||||
|
"cert/test_root_certs_builtin.cc",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +40,8 @@ class DefaultCertVerifyProcFactory : public net::CertVerifyProcFactory {
|
|||||||
return CertVerifyProc::CreateBuiltinWithChromeRootStore(
|
return CertVerifyProc::CreateBuiltinWithChromeRootStore(
|
||||||
std::move(cert_net_fetcher), impl_params.crl_set,
|
std::move(cert_net_fetcher), impl_params.crl_set,
|
||||||
base::OptionalToPtr(impl_params.root_store_data));
|
base::OptionalToPtr(impl_params.root_store_data));
|
||||||
#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
|
||||||
|
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||||
return CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher),
|
return CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher),
|
||||||
impl_params.crl_set);
|
impl_params.crl_set);
|
||||||
#else
|
#else
|
||||||
|
@ -52,7 +52,8 @@
|
|||||||
#include "url/url_canon.h"
|
#include "url/url_canon.h"
|
||||||
|
|
||||||
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(USE_NSS_CERTS) || \
|
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(USE_NSS_CERTS) || \
|
||||||
BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
|
BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) || BUILDFLAG(IS_ANDROID) || \
|
||||||
|
BUILDFLAG(IS_LINUX)
|
||||||
#include "net/cert/cert_verify_proc_builtin.h"
|
#include "net/cert/cert_verify_proc_builtin.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -426,7 +427,8 @@ scoped_refptr<CertVerifyProc> CertVerifyProc::CreateSystemVerifyProc(
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(USE_NSS_CERTS)
|
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(USE_NSS_CERTS) || \
|
||||||
|
BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
||||||
// static
|
// static
|
||||||
scoped_refptr<CertVerifyProc> CertVerifyProc::CreateBuiltinVerifyProc(
|
scoped_refptr<CertVerifyProc> CertVerifyProc::CreateBuiltinVerifyProc(
|
||||||
scoped_refptr<CertNetFetcher> cert_net_fetcher,
|
scoped_refptr<CertNetFetcher> cert_net_fetcher,
|
||||||
|
@ -88,7 +88,8 @@ class NET_EXPORT CertVerifyProc
|
|||||||
scoped_refptr<CRLSet> crl_set);
|
scoped_refptr<CRLSet> crl_set);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(USE_NSS_CERTS)
|
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(USE_NSS_CERTS) || \
|
||||||
|
BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
||||||
// Creates and returns a CertVerifyProcBuiltin using the SSL SystemTrustStore.
|
// Creates and returns a CertVerifyProcBuiltin using the SSL SystemTrustStore.
|
||||||
static scoped_refptr<CertVerifyProc> CreateBuiltinVerifyProc(
|
static scoped_refptr<CertVerifyProc> CreateBuiltinVerifyProc(
|
||||||
scoped_refptr<CertNetFetcher> cert_net_fetcher,
|
scoped_refptr<CertNetFetcher> cert_net_fetcher,
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include "net/cert/x509_certificate.h"
|
#include "net/cert/x509_certificate.h"
|
||||||
|
|
||||||
#if BUILDFLAG(USE_NSS_CERTS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
#if BUILDFLAG(USE_NSS_CERTS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
|
||||||
BUILDFLAG(IS_FUCHSIA)
|
BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
||||||
// When not defined, the EVRootCAMetadata singleton is a dumb placeholder
|
// When not defined, the EVRootCAMetadata singleton is a dumb placeholder
|
||||||
// implementation that will fail all EV lookup operations.
|
// implementation that will fail all EV lookup operations.
|
||||||
#define PLATFORM_USES_CHROMIUM_EV_METADATA
|
#define PLATFORM_USES_CHROMIUM_EV_METADATA
|
||||||
|
Loading…
Reference in New Issue
Block a user