Compare commits

..

No commits in common. "466de61232b6314ca3066512469b06d0c8ce4872" and "48c6f842b4524c7715f4edd683355ea9e7f4fabd" have entirely different histories.

2 changed files with 9 additions and 4 deletions

11
node.js
View File

@ -379,7 +379,11 @@ ACME._challengeToAuth = function (me, options, request, challenge, dryrun) {
// (note the duplicate status overwrites the one above, but they should be the same) // (note the duplicate status overwrites the one above, but they should be the same)
Object.keys(challenge).forEach(function (key) { Object.keys(challenge).forEach(function (key) {
// don't confused devs with the id url // don't confused devs with the id url
auth[key] = challenge[key]; if ('url' === key) {
//auth.uri = challenge.url;
} else {
auth[key] = challenge[key];
}
}); });
// batteries-included helpers // batteries-included helpers
@ -389,8 +393,9 @@ ACME._challengeToAuth = function (me, options, request, challenge, dryrun) {
auth.thumbprint = me.RSA.thumbprint(options.accountKeypair); auth.thumbprint = me.RSA.thumbprint(options.accountKeypair);
// keyAuthorization = token || '.' || base64url(JWK_Thumbprint(accountKey)) // keyAuthorization = token || '.' || base64url(JWK_Thumbprint(accountKey))
auth.keyAuthorization = challenge.token + '.' + auth.thumbprint; auth.keyAuthorization = challenge.token + '.' + auth.thumbprint;
// conflicts with ACME challenge id url is already in use, so we call this challengeUrl instead // conflicts with ACME challenge id url, if we ever decide to use it, but this just makes sense
auth.challengeUrl = 'http://' + auth.identifier.value + ACME.challengePrefixes['http-01'] + '/' + auth.token; // (as opposed to httpUrl or challengeUrl or uri, etc - I'd be happier to call the id url a uri)
auth.url = 'http://' + auth.identifier.value + ACME.challengePrefixes['http-01'] + '/' + auth.token;
auth.dnsHost = dnsPrefix + '.' + auth.hostname.replace('*.', ''); auth.dnsHost = dnsPrefix + '.' + auth.hostname.replace('*.', '');
auth.dnsAuthorization = ACME._toWebsafeBase64( auth.dnsAuthorization = ACME._toWebsafeBase64(
require('crypto').createHash('sha256').update(auth.keyAuthorization).digest('base64') require('crypto').createHash('sha256').update(auth.keyAuthorization).digest('base64')

View File

@ -1,6 +1,6 @@
{ {
"name": "acme-v2", "name": "acme-v2",
"version": "1.7.7", "version": "1.7.6",
"description": "Free SSL. A framework for building Let's Encrypt v2 clients, and other ACME v2 (draft 11) clients. Successor to le-acme-core.js", "description": "Free SSL. A framework for building Let's Encrypt v2 clients, and other ACME v2 (draft 11) clients. Successor to le-acme-core.js",
"homepage": "https://git.coolaj86.com/coolaj86/acme-v2.js", "homepage": "https://git.coolaj86.com/coolaj86/acme-v2.js",
"main": "node.js", "main": "node.js",