From 302ca8669dd35121ab1a2bb5126ba6c3e48ff792 Mon Sep 17 00:00:00 2001
From: joshaber <joshaber@gmail.com>
Date: Fri, 31 Mar 2017 15:44:47 -0400
Subject: [PATCH] Slightly better conversion

---
 atom/common/native_mate_converters/net_converter.cc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/atom/common/native_mate_converters/net_converter.cc b/atom/common/native_mate_converters/net_converter.cc
index 8e8f6c00149..59f897c8a74 100644
--- a/atom/common/native_mate_converters/net_converter.cc
+++ b/atom/common/native_mate_converters/net_converter.cc
@@ -82,7 +82,18 @@ bool Converter<scoped_refptr<net::X509Certificate>>::FromV8(
 
   std::string data;
   dict.Get("data", &data);
-  *out = net::X509Certificate::CreateFromBytes(data.c_str(), data.length());
+
+  auto certificate_list = net::X509Certificate::CreateCertificateListFromBytes(
+    data.c_str(), data.length(),
+    net::X509Certificate::FORMAT_SINGLE_CERTIFICATE);
+  if (certificate_list.empty())
+    return false;
+
+  auto certificate = certificate_list.front();
+  if (!certificate)
+    return false;
+
+  *out = certificate;
   return true;
 }