mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #6881 from electron/data-string

Browse source 
Certificate data is now a string
This commit is contained in:
Cheng Zhao 2016-08-17 21:13:31 +09:00 committed by GitHub
commit 2e8d7cd6db
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_app.cc
View file

@ -168,13 +168,12 @@ void OnClientCertificateSelected(
return; return;
} }
v8::Local<v8::Object> data; std::string data;
if (!cert_data.Get("data", &data)) if (!cert_data.Get("data", &data))
return; return;
auto certs = net::X509Certificate::CreateCertificateListFromBytes( auto certs = net::X509Certificate::CreateCertificateListFromBytes(
node::Buffer::Data(data), node::Buffer::Length(data), data.c_str(), data.length(), net::X509Certificate::FORMAT_AUTO);
net::X509Certificate::FORMAT_AUTO);
if (certs.size() > 0) if (certs.size() > 0)
delegate->ContinueWithCertificate(certs[0].get()); delegate->ContinueWithCertificate(certs[0].get());
} }