coolaj86
/
greenlock.js-ARCHIVED
3
3
Fork 0
Code Issues 6 Pull Requests 1 Releases Activity

v2.3.8: update rsa-compat

This commit is contained in:
AJ ONeal 2018-07-13 04:20:57 -06:00
parent aece586c90
commit 1abd3e43de
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/core.js
View File

@ -80,8 +80,6 @@ module.exports.create = function (gl) {
} }
return utils.testEmail(args.email).then(function () { return utils.testEmail(args.email).then(function () {
var keypairOpts = { public: true, pem: true };
var promise = gl.store.accounts.checkKeypairAsync(args).then(function (keypair) { var promise = gl.store.accounts.checkKeypairAsync(args).then(function (keypair) {
if (keypair) { if (keypair) {
return RSA.import(keypair); return RSA.import(keypair);
@ -91,7 +89,8 @@ module.exports.create = function (gl) {
return gl.store.accounts.setKeypairAsync(args, RSA.import(args.accountKeypair)); return gl.store.accounts.setKeypairAsync(args, RSA.import(args.accountKeypair));
} }
return RSA.generateKeypairAsync(args.rsaKeySize, 65537, keypairOpts).then(function (keypair) { var keypairOpts = { bitlen: args.rsaKeySize, exp: 65537, public: true, pem: true };
return RSA.generateKeypairAsync(keypairOpts).then(function (keypair) {
keypair.privateKeyPem = RSA.exportPrivatePem(keypair); keypair.privateKeyPem = RSA.exportPrivatePem(keypair);
keypair.publicKeyPem = RSA.exportPublicPem(keypair); keypair.publicKeyPem = RSA.exportPublicPem(keypair);
keypair.privateKeyJwk = RSA.exportPrivateJwk(keypair); keypair.privateKeyJwk = RSA.exportPrivateJwk(keypair);
@ -253,8 +252,8 @@ module.exports.create = function (gl) {
return gl.store.certificates.setKeypairAsync(args, RSA.import(args.domainKeypair)); return gl.store.certificates.setKeypairAsync(args, RSA.import(args.domainKeypair));
} }
var keypairOpts = { public: true, pem: true }; var keypairOpts = { bitlen: args.rsaKeySize, exp: 65537, public: true, pem: true };
return RSA.generateKeypairAsync(args.rsaKeySize, 65537, keypairOpts).then(function (keypair) { return RSA.generateKeypairAsync(keypairOpts).then(function (keypair) {
keypair.privateKeyPem = RSA.exportPrivatePem(keypair); keypair.privateKeyPem = RSA.exportPrivatePem(keypair);
keypair.publicKeyPem = RSA.exportPublicPem(keypair); keypair.publicKeyPem = RSA.exportPublicPem(keypair);
keypair.privateKeyJwk = RSA.exportPrivateJwk(keypair); keypair.privateKeyJwk = RSA.exportPrivateJwk(keypair);

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.3.7", "version": "2.3.8",
"description": "Let's Encrypt for node.js on npm", "description": "Let's Encrypt for node.js on npm",
"main": "index.js", "main": "index.js",
"files": [ "files": [
@ -62,7 +62,7 @@
"le-store-certbot": "^2.1.7", "le-store-certbot": "^2.1.7",
"node.extend": "^1.1.5", "node.extend": "^1.1.5",
"pkijs": "^1.3.27", "pkijs": "^1.3.27",
"rsa-compat": "^1.4.0" "rsa-compat": "^1.5.0"
}, },
"engines": { "engines": {
"node": ">=4.5" "node": ">=4.5"