make Prettier
This commit is contained in:
parent
76f98f7c7e
commit
8e2763ecd6
|
@ -4,26 +4,28 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
'use strict';
|
||||
|
||||
module.exports = function (bitlen, exp) {
|
||||
var k = require('node-forge').pki.rsa
|
||||
.generateKeyPair({ bits: bitlen || 2048, e: exp || 0x10001 }).privateKey;
|
||||
module.exports = function(bitlen, exp) {
|
||||
var k = require('node-forge').pki.rsa.generateKeyPair({
|
||||
bits: bitlen || 2048,
|
||||
e: exp || 0x10001
|
||||
}).privateKey;
|
||||
var jwk = {
|
||||
kty: "RSA"
|
||||
, n: _toUrlBase64(k.n)
|
||||
, e: _toUrlBase64(k.e)
|
||||
, d: _toUrlBase64(k.d)
|
||||
, p: _toUrlBase64(k.p)
|
||||
, q: _toUrlBase64(k.q)
|
||||
, dp: _toUrlBase64(k.dP)
|
||||
, dq: _toUrlBase64(k.dQ)
|
||||
, qi: _toUrlBase64(k.qInv)
|
||||
kty: 'RSA',
|
||||
n: _toUrlBase64(k.n),
|
||||
e: _toUrlBase64(k.e),
|
||||
d: _toUrlBase64(k.d),
|
||||
p: _toUrlBase64(k.p),
|
||||
q: _toUrlBase64(k.q),
|
||||
dp: _toUrlBase64(k.dP),
|
||||
dq: _toUrlBase64(k.dQ),
|
||||
qi: _toUrlBase64(k.qInv)
|
||||
};
|
||||
return {
|
||||
private: jwk
|
||||
, public: {
|
||||
kty: jwk.kty
|
||||
, n: jwk.n
|
||||
, e: jwk.e
|
||||
private: jwk,
|
||||
public: {
|
||||
kty: jwk.kty,
|
||||
n: jwk.n,
|
||||
e: jwk.e
|
||||
}
|
||||
};
|
||||
};
|
||||
|
@ -37,11 +39,11 @@ function _toUrlBase64(fbn) {
|
|||
while ('00' === hex.slice(0, 2)) {
|
||||
hex = hex.slice(2);
|
||||
}
|
||||
return Buffer.from(hex, 'hex').toString('base64')
|
||||
.replace(/\+/g, "-")
|
||||
.replace(/\//g, "_")
|
||||
.replace(/=/g,"")
|
||||
;
|
||||
return Buffer.from(hex, 'hex')
|
||||
.toString('base64')
|
||||
.replace(/\+/g, '-')
|
||||
.replace(/\//g, '_')
|
||||
.replace(/=/g, '');
|
||||
}
|
||||
|
||||
if (require.main === module) {
|
||||
|
|
|
@ -4,15 +4,13 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
'use strict';
|
||||
|
||||
module.exports = function (bitlen, exp) {
|
||||
var keypair = require('crypto').generateKeyPairSync(
|
||||
'rsa'
|
||||
, { modulusLength: bitlen
|
||||
, publicExponent: exp
|
||||
, privateKeyEncoding: { type: 'pkcs1', format: 'pem' }
|
||||
, publicKeyEncoding: { type: 'pkcs1', format: 'pem' }
|
||||
}
|
||||
);
|
||||
module.exports = function(bitlen, exp) {
|
||||
var keypair = require('crypto').generateKeyPairSync('rsa', {
|
||||
modulusLength: bitlen,
|
||||
publicExponent: exp,
|
||||
privateKeyEncoding: { type: 'pkcs1', format: 'pem' },
|
||||
publicKeyEncoding: { type: 'pkcs1', format: 'pem' }
|
||||
});
|
||||
var result = { privateKeyPem: keypair.privateKey.trim() };
|
||||
return result;
|
||||
};
|
||||
|
|
|
@ -4,15 +4,20 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
'use strict';
|
||||
|
||||
module.exports = function (bitlen, exp) {
|
||||
module.exports = function(bitlen, exp) {
|
||||
var ursa;
|
||||
try {
|
||||
ursa = require('ursa');
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
ursa = require('ursa-optional');
|
||||
}
|
||||
var keypair = ursa.generatePrivateKey(bitlen, exp);
|
||||
var result = { privateKeyPem: keypair.toPrivatePem().toString('ascii').trim() };
|
||||
var result = {
|
||||
privateKeyPem: keypair
|
||||
.toPrivatePem()
|
||||
.toString('ascii')
|
||||
.trim()
|
||||
};
|
||||
return result;
|
||||
};
|
||||
|
||||
|
|
|
@ -6,53 +6,79 @@
|
|||
|
||||
var oldver = false;
|
||||
|
||||
module.exports = function (bitlen, exp) {
|
||||
module.exports = function(bitlen, exp) {
|
||||
bitlen = parseInt(bitlen, 10) || 2048;
|
||||
exp = parseInt(exp, 10) || 65537;
|
||||
|
||||
try {
|
||||
return require('./generate-privkey-node.js')(bitlen, exp);
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
if (!/generateKeyPairSync is not a function/.test(e.message)) {
|
||||
throw e;
|
||||
}
|
||||
try {
|
||||
return require('./generate-privkey-ursa.js')(bitlen, exp);
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
if (e.code !== 'MODULE_NOT_FOUND') {
|
||||
console.error("[rsa-compat] Unexpected error when using 'ursa':");
|
||||
console.error(
|
||||
"[rsa-compat] Unexpected error when using 'ursa':"
|
||||
);
|
||||
console.error(e);
|
||||
}
|
||||
if (!oldver) {
|
||||
oldver = true;
|
||||
console.warn("[WARN] rsa-compat: Your version of node does not have crypto.generateKeyPair()");
|
||||
console.warn("[WARN] rsa-compat: Please update to node >= v10.12 or 'npm install --save ursa node-forge'");
|
||||
console.warn("[WARN] rsa-compat: Using node-forge as a fallback may be unacceptably slow.");
|
||||
console.warn(
|
||||
'[WARN] rsa-compat: Your version of node does not have crypto.generateKeyPair()'
|
||||
);
|
||||
console.warn(
|
||||
"[WARN] rsa-compat: Please update to node >= v10.12 or 'npm install --save ursa node-forge'"
|
||||
);
|
||||
console.warn(
|
||||
'[WARN] rsa-compat: Using node-forge as a fallback may be unacceptably slow.'
|
||||
);
|
||||
if (/arm|mips/i.test(require('os').arch)) {
|
||||
console.warn("================================================================");
|
||||
console.warn(" WARNING");
|
||||
console.warn("================================================================");
|
||||
console.warn("");
|
||||
console.warn("WARNING: You are generating an RSA key using pure JavaScript on");
|
||||
console.warn(" a VERY SLOW cpu. This could take DOZENS of minutes!");
|
||||
console.warn("");
|
||||
console.warn(" We recommend installing node >= v10.12, or 'gcc' and 'ursa'");
|
||||
console.warn("");
|
||||
console.warn("EXAMPLE:");
|
||||
console.warn("");
|
||||
console.warn(" sudo apt-get install build-essential && npm install ursa");
|
||||
console.warn("");
|
||||
console.warn("================================================================");
|
||||
console.warn(
|
||||
'================================================================'
|
||||
);
|
||||
console.warn(' WARNING');
|
||||
console.warn(
|
||||
'================================================================'
|
||||
);
|
||||
console.warn('');
|
||||
console.warn(
|
||||
'WARNING: You are generating an RSA key using pure JavaScript on'
|
||||
);
|
||||
console.warn(
|
||||
' a VERY SLOW cpu. This could take DOZENS of minutes!'
|
||||
);
|
||||
console.warn('');
|
||||
console.warn(
|
||||
" We recommend installing node >= v10.12, or 'gcc' and 'ursa'"
|
||||
);
|
||||
console.warn('');
|
||||
console.warn('EXAMPLE:');
|
||||
console.warn('');
|
||||
console.warn(
|
||||
' sudo apt-get install build-essential && npm install ursa'
|
||||
);
|
||||
console.warn('');
|
||||
console.warn(
|
||||
'================================================================'
|
||||
);
|
||||
}
|
||||
}
|
||||
try {
|
||||
return require('./generate-privkey-forge.js')(bitlen, exp);
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
if (e.code !== 'MODULE_NOT_FOUND') {
|
||||
throw e;
|
||||
}
|
||||
console.error("[ERROR] rsa-compat: could not generate a private key.");
|
||||
console.error("None of crypto.generateKeyPair, ursa, nor node-forge are present");
|
||||
console.error(
|
||||
'[ERROR] rsa-compat: could not generate a private key.'
|
||||
);
|
||||
console.error(
|
||||
'None of crypto.generateKeyPair, ursa, nor node-forge are present'
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue