nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2024-09-20 15:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

prefer pkcs1 for acme account

Browse source
This commit is contained in:
Andris Reinman 2021-09-10 10:04:22 +03:00
parent c8cd86575d
commit bf60817694
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/acme/certs.js
View file

@ -91,7 +91,7 @@ const getAcmeAccount = async (acmeOptions, certHandler) => {
// account not found, create a new one
log.info('ACME', 'ACME account for %s not found, provisioning new one from %s', acmeOptions.key, acmeOptions.directoryUrl);
const accountKey = await certHandler.generateKey(acmeOptions.keyBits, acmeOptions.keyExponent);
const accountKey = await certHandler.generateKey(acmeOptions.keyBits, acmeOptions.keyExponent, { privateKeyEncoding: 'pkcs1' });
const jwkAccount = pem2jwk(accountKey);
log.info('ACME', 'Generated Acme account key for %s', acmeOptions.key);
@ -281,7 +281,7 @@ const acquireCert = async (domain, acmeOptions, certificateData, certHandler) =>
log.error('ACME', 'Redis call failed key=%s domains=%s error=%s', domainSafeLockKey, domain, err.message);
}
log.error('ACME', 'Failed to generate cert domains=%s error=%s', domain, err.message);
log.error('ACME', 'Failed to generate cert domains=%s error=%s', domain, err.stack);
if (certificateData && certificateData._id) {
try {

5
lib/cert-handler.js
View file

@ -49,7 +49,8 @@ class CertHandler {
return response;
}
async generateKey(keyBits, keyExponent) {
async generateKey(keyBits, keyExponent, opts) {
opts = opts || {};
const { privateKey /*, publicKey */ } = await generateKeyPair('rsa', {
modulusLength: keyBits || 2048, // options
publicExponent: keyExponent || 65537,
@ -58,7 +59,7 @@ class CertHandler {
format: 'pem'
},
privateKeyEncoding: {
type: 'pkcs8',
type: opts.privateKeyEncoding || 'pkcs8',
format: 'pem'
}
});