diff --git a/Userland/Libraries/LibTLS/Certificate.h b/Userland/Libraries/LibTLS/Certificate.h index ae2408e81d..cfd931e8c9 100644 --- a/Userland/Libraries/LibTLS/Certificate.h +++ b/Userland/Libraries/LibTLS/Certificate.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -295,11 +294,9 @@ public: static ErrorOr> parse_pem_root_certificate_authorities(ByteBuffer&); static ErrorOr> load_certificates(); - static DefaultRootCACertificates& the() { return s_the; } + static DefaultRootCACertificates& the(); private: - static Singleton s_the; - Vector m_ca_certificates; }; diff --git a/Userland/Libraries/LibTLS/TLSv12.cpp b/Userland/Libraries/LibTLS/TLSv12.cpp index 68ede57755..5d7a94666d 100644 --- a/Userland/Libraries/LibTLS/TLSv12.cpp +++ b/Userland/Libraries/LibTLS/TLSv12.cpp @@ -489,7 +489,6 @@ Vector TLSv12::parse_pem_certificate(ReadonlyBytes certificate_pem_ return { move(certificate) }; } -Singleton DefaultRootCACertificates::s_the; DefaultRootCACertificates::DefaultRootCACertificates() { auto load_result = load_certificates(); @@ -501,6 +500,12 @@ DefaultRootCACertificates::DefaultRootCACertificates() m_ca_certificates = load_result.release_value(); } +DefaultRootCACertificates& DefaultRootCACertificates::the() +{ + static DefaultRootCACertificates s_the; + return s_the; +} + ErrorOr> DefaultRootCACertificates::load_certificates() { auto cacert_file = TRY(Core::File::open("/etc/cacert.pem"sv, Core::File::OpenMode::Read));