More X509View

nodejs · Jan 16, 2025 · 19d30a0 · 19d30a0
1 parent 69d176c
commit 19d30a0
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
@@ -446,19 +446,16 @@ void ReadMacOSKeychainCertificates(
   CFRelease(currAnchors);
 
   for (size_t i = 0; i < system_root_certificates_X509.size(); i++) {
-    BIOPointer bio(BIO_new(BIO_s_mem()));
-    CHECK(bio);
-
-    BUF_MEM* mem = nullptr;
-    int result = PEM_write_bio_X509(bio.get(),
-                                    system_root_certificates_X509[i]);
-    if (!result) {
-      fprintf(stderr, "Warning: PEM_write_bio_X509 failed with: %d", result);
+    ncrypto::X509View x509_view(system_root_certificates_X509[i]);
+
+    auto pemBio = x509_view.toPEM();
+    if (!pemBio) {
+      fprintf(stderr, "Warning: converting to pem failed");
       continue;
     }
 
-    BIO_get_mem_ptr(bio.get(), &mem);
-    std::string certificate_string_pem(mem->data, mem->length);
+    auto pemCString = bioToCString(&pemBio);
+    std::string certificate_string_pem = pemCString;
 
     system_root_certificates->emplace_back(certificate_string_pem);
   }