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

randomRequested is never turned off

Browse Source
This commit is contained in:
KAYLukas 2018-04-16 17:05:44 +02:00
parent f1714fd9b5
commit d0ed5134d7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/worker/worker.js
View File

@ -34,7 +34,6 @@ importScripts('openpgp.js');
var openpgp = window.openpgp; var openpgp = window.openpgp;
var randomQueue = []; var randomQueue = [];
var randomRequested = false;
var MIN_SIZE_RANDOM_BUFFER = 40000; var MIN_SIZE_RANDOM_BUFFER = 40000;
var MAX_SIZE_RANDOM_BUFFER = 60000; var MAX_SIZE_RANDOM_BUFFER = 60000;
var MIN_SIZE_RANDOM_REQUEST = 20000; var MIN_SIZE_RANDOM_REQUEST = 20000;
@ -45,10 +44,9 @@ var MIN_SIZE_RANDOM_REQUEST = 20000;
*/ */
function randomCallback() { function randomCallback() {
if (!randomRequested) { if (!randomQueue.length) {
self.postMessage({ event: 'request-seed', amount: MAX_SIZE_RANDOM_BUFFER }); self.postMessage({ event: 'request-seed', amount: MAX_SIZE_RANDOM_BUFFER });
} }
randomRequested = true;
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
randomQueue.push(resolve); randomQueue.push(resolve);
@ -134,7 +132,7 @@ function delegate(id, method, options) {
* @param {Object} event Contains event type and data * @param {Object} event Contains event type and data
*/ */
function response(event) { function response(event) {
if (!randomRequested && openpgp.crypto.random.randomBuffer.size < MIN_SIZE_RANDOM_BUFFER) { if (!randomQueue.length && openpgp.crypto.random.randomBuffer.size < MIN_SIZE_RANDOM_BUFFER) {
self.postMessage({ event: 'request-seed', amount: MIN_SIZE_RANDOM_REQUEST }); self.postMessage({ event: 'request-seed', amount: MIN_SIZE_RANDOM_REQUEST });
} }
self.postMessage(event, openpgp.util.getTransferables(event.data)); self.postMessage(event, openpgp.util.getTransferables(event.data));