github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6529 from darkdh/serial_number

Browse Source 
serial number in hex string
This commit is contained in:
Cheng Zhao
2016-07-20 05:00:57 -06:00
committed by GitHub
parent 4081381700 9e6f623a5c
commit 81c790dfdb
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/common/native_mate_converters/net_converter.cc
View File

@@ -11,6 +11,7 @@
#include "atom/common/native_mate_converters/gurl_converter.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "base/values.h"
#include "base/strings/string_number_conversions.h"
#include "native_mate/dictionary.h"
#include "net/base/upload_bytes_element_reader.h"
#include "net/base/upload_data_stream.h"
@@ -47,7 +48,8 @@ v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
dict.Set("data", buffer);
dict.Set("issuerName", val->issuer().GetDisplayName());
dict.Set("subjectName", val->subject().GetDisplayName());
dict.Set("serialNumber", val->serial_number());
dict.Set("serialNumber", base::HexEncode(val->serial_number().data(),
val->serial_number().size()));
dict.Set("validStart", val->valid_start().ToDoubleT());
dict.Set("validExpiry", val->valid_expiry().ToDoubleT());
dict.Set("fingerprint",

12
docs/api/app.md
View File

@@ -181,9 +181,9 @@ Returns:
* `data` Buffer - PEM encoded data
* `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name
* `serialNumber` Buffer - DER encoded data
* `validStart` Integer - Start date of the certificate being valid
* `validExpiry` Integer - End date of the certificate being valid
* `serialNumber` String - Hex value represented string
* `validStart` Integer - Start date of the certificate being valid in seconds
* `validExpiry` Integer - End date of the certificate being valid in seconds
* `fingerprint` String - Fingerprint of the certificate
* `callback` Function
@@ -214,9 +214,9 @@ Returns:
* `data` Buffer - PEM encoded data
* `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name
* `serialNumber` - DER encoded data
* `validStart` Integer - Start date of the certificate being valid
* `validExpiry` Integer - End date of the certificate being valid
* `serialNumber` String - Hex value represented string
* `validStart` Integer - Start date of the certificate being valid in seconds
* `validExpiry` Integer - End date of the certificate being valid in seconds
* `fingerprint` String - Fingerprint of the certificate
* `callback` Function

12
docs/api/web-contents.md
View File

@@ -231,9 +231,9 @@ Returns:
* `data` Buffer - PEM encoded data
* `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name
* `serialNumber` - DER encoded data
* `validStart` Integer - Start date of the certificate being valid
* `validExpiry` Integer - End date of the certificate being valid
* `serialNumber` String - Hex value represented string
* `validStart` Integer - Start date of the certificate being valid in seconds
* `validExpiry` Integer - End date of the certificate being valid in seconds
* `fingerprint` String - Fingerprint of the certificate
* `callback` Function
@@ -252,9 +252,9 @@ Returns:
* `data` Buffer - PEM encoded data
* `issuerName` String - Issuer's Common Name
* `subjectName` String - Subject's Common Name
* `serialNumber` - DER encoded data
* `validStart` Integer - Start date of the certificate being valid
* `validExpiry` Integer - End date of the certificate being valid
* `serialNumber` String - Hex value represented string
* `validStart` Integer - Start date of the certificate being valid in seconds
* `validExpiry` Integer - End date of the certificate being valid in seconds
* `fingerprint` String - Fingerprint of the certificate
* `callback` Function