Merge pull request #6529 from darkdh/serial_number

serial number in hex string

atom/common/native_mate_converters/net_converter.cc

@@ -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",

docs/api/app.md

@@ -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
 

docs/api/web-contents.md

@@ -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