Merge branch 'wuchangming-master'

This commit is contained in:
OttoMao 2016-05-26 17:55:34 +08:00
commit b38eb0c227

View File

@ -13,8 +13,9 @@ function getKeysAndCert(){
cert.publicKey = keys.publicKey; cert.publicKey = keys.publicKey;
cert.serialNumber = '01'; cert.serialNumber = '01';
cert.validity.notBefore = new Date(); cert.validity.notBefore = new Date();
cert.validity.notBefore.setFullYear(cert.validity.notBefore.getFullYear() - 10); // 10 years
cert.validity.notAfter = new Date(); cert.validity.notAfter = new Date();
cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 10); // 10 years cert.validity.notAfter.setFullYear(cert.validity.notAfter.getFullYear() + 10); // 10 years
return { return {
keys: keys, keys: keys,
cert: cert cert: cert
@ -82,4 +83,4 @@ function generateCertsForHostname(domain, rootCAConfig){
} }
module.exports.generateRootCA = generateRootCA; module.exports.generateRootCA = generateRootCA;
module.exports.generateCertsForHostname = generateCertsForHostname; module.exports.generateCertsForHostname = generateCertsForHostname;