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

Merge pull request #6814 from brave/net-converter-fix

Browse source 
don't convert a string to an array buffer
This commit is contained in:
Cheng Zhao 2016-08-17 20:44:13 +09:00 • committed by GitHub
commit 47c37d6f51
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/common/native_mate_converters/net_converter.cc
View file

@ -42,10 +42,7 @@ v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
std::string encoded_data; std::string encoded_data;
net::X509Certificate::GetPEMEncoded( net::X509Certificate::GetPEMEncoded(
val->os_cert_handle(), &encoded_data); val->os_cert_handle(), &encoded_data);
auto buffer = node::Buffer::Copy(isolate, dict.Set("data", encoded_data);
encoded_data.data(),
encoded_data.size()).ToLocalChecked();
dict.Set("data", buffer);
dict.Set("issuerName", val->issuer().GetDisplayName()); dict.Set("issuerName", val->issuer().GetDisplayName());
dict.Set("subjectName", val->subject().GetDisplayName()); dict.Set("subjectName", val->subject().GetDisplayName());
dict.Set("serialNumber", base::HexEncode(val->serial_number().data(), dict.Set("serialNumber", base::HexEncode(val->serial_number().data(),

4
docs/api/app.md
View file

@ -178,7 +178,7 @@ Returns:
* `url` URL * `url` URL
* `error` String - The error code * `error` String - The error code
* `certificate` Object * `certificate` Object
* `data` Buffer - PEM encoded data * `data` String - PEM encoded data
* `issuerName` String - Issuer's Common Name * `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name * `subjectName` String - Subject's Common Name
* `serialNumber` String - Hex value represented string * `serialNumber` String - Hex value represented string
@ -213,7 +213,7 @@ Returns:
* `webContents` [WebContents](web-contents.md) * `webContents` [WebContents](web-contents.md)
* `url` URL * `url` URL
* `certificateList` [Objects] * `certificateList` [Objects]
* `data` Buffer - PEM encoded data * `data` String - PEM encoded data
* `issuerName` String - Issuer's Common Name * `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name * `subjectName` String - Subject's Common Name
* `serialNumber` String - Hex value represented string * `serialNumber` String - Hex value represented string

4
docs/api/web-contents.md
View file

@ -231,7 +231,7 @@ Returns:
* `url` URL * `url` URL
* `error` String - The error code * `error` String - The error code
* `certificate` Object * `certificate` Object
* `data` Buffer - PEM encoded data * `data` String - PEM encoded data
* `issuerName` String - Issuer's Common Name * `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name * `subjectName` String - Subject's Common Name
* `serialNumber` String - Hex value represented string * `serialNumber` String - Hex value represented string
@ -252,7 +252,7 @@ Returns:
* `event` Event * `event` Event
* `url` URL * `url` URL
* `certificateList` [Objects] * `certificateList` [Objects]
* `data` Buffer - PEM encoded data * `data` String - PEM encoded data
* `issuerName` String - Issuer's Common Name * `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name * `subjectName` String - Subject's Common Name
* `serialNumber` String - Hex value represented string * `serialNumber` String - Hex value represented string