suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimizes getRandomBN, Brings back IE11 KeyOperation helper

Browse Source
This commit is contained in:
Mahrud Sayrafi 2018-02-26 16:22:08 -05:00
parent 2e95335825
commit 378fb85733
No known key found for this signature in database
GPG Key ID: C24071B956C3245F
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/crypto/public_key/rsa.js
View File

@ -42,6 +42,21 @@ function b64toBN(base64url) {
return new BN(hex, 16); return new BN(hex, 16);
} }
// Helper for IE11 KeyOperation objects
function promisifyIE11Op(keyObj, err) {
if (typeof keyObj.then !== 'function') { // IE11 KeyOperation
return new Promise(function(resolve, reject) {
keyObj.onerror = function () {
reject(new Error(err));
};
keyObj.oncomplete = function (e) {
resolve(e.target.result);
};
});
}
return keyObj;
}
export default { export default {
/** Create signature /** Create signature
* @param m message as BN * @param m message as BN
@ -158,7 +173,8 @@ export default {
name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verify' name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verify'
} }
}; };
keyPair = await webCrypto.generateKey(keyGenOpt, true, ['sign', 'verify']); keyPair = webCrypto.generateKey(keyGenOpt, true, ['sign', 'verify']);
keyPair = await promisifyIE11Op(keyPair, 'Error generating RSA key pair.');
} else if (window.crypto && window.crypto.webkitSubtle) { } else if (window.crypto && window.crypto.webkitSubtle) {
// outdated spec implemented by old Webkit // outdated spec implemented by old Webkit
keyGenOpt = { keyGenOpt = {
@ -176,7 +192,8 @@ export default {
// export the generated keys as JsonWebKey (JWK) // export the generated keys as JsonWebKey (JWK)
// https://tools.ietf.org/html/draft-ietf-jose-json-web-key-33 // https://tools.ietf.org/html/draft-ietf-jose-json-web-key-33
let jwk = await webCrypto.exportKey('jwk', keyPair.privateKey); let jwk = webCrypto.exportKey('jwk', keyPair.privateKey);
jwk = await promisifyIE11Op(jwk, 'Error exporting RSA key pair.');
// parse raw ArrayBuffer bytes to jwk/json (WebKit/Safari/IE11 quirk) // parse raw ArrayBuffer bytes to jwk/json (WebKit/Safari/IE11 quirk)
if (jwk instanceof ArrayBuffer) { if (jwk instanceof ArrayBuffer) {

8
src/crypto/random.js
View File

@ -109,11 +109,15 @@ export default {
let r; let r;
const modulus = max.sub(min); const modulus = max.sub(min);
const length = modulus.byteLength(); const bits = modulus.bitLength();
const bytes = modulus.byteLength();
// Using a while loop is necessary to avoid bias // Using a while loop is necessary to avoid bias
do { do {
r = new BN(this.getRandomBytes(length)); r = new BN(this.getRandomBytes(bytes));
if (r.bitLength() > bits) {
r.ishrn(r.bitLength() - bits);
}
} while (r.cmp(modulus) >= 0); } while (r.cmp(modulus) >= 0);
return r.iadd(min); return r.iadd(min);