keeweb
/
keeweb
mirror of https://github.com/keeweb/keeweb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

removed asm.js fallback

This commit is contained in:
antelle 2018-03-09 21:25:41 +01:00
parent 6854531584
commit 972b7066dc
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@ -46,7 +46,7 @@ module.exports = function(grunt) {
entry: {
app: 'app',
vendor: ['jquery', 'underscore', 'backbone', 'kdbxweb', 'baron', 'pikaday', 'filesaver', 'qrcode',
'argon2-asm', 'argon2-wasm', 'argon2']
'argon2-wasm', 'argon2']
},
output: {
path: path.resolve('.', 'tmp/js'),
@ -72,7 +72,6 @@ module.exports = function(grunt) {
pikaday: 'pikaday/pikaday.js',
filesaver: 'FileSaver.js/FileSaver.min.js',
qrcode: 'jsqrcode/dist/qrcode.min.js',
'argon2-asm': 'argon2-browser/docs/dist/argon2-asm.min.js',
'argon2-wasm': 'argon2-browser/docs/dist/argon2.wasm',
'argon2': 'argon2-browser/docs/dist/argon2.min.js',
templates: path.join(__dirname, 'app/templates')
@ -100,7 +99,6 @@ module.exports = function(grunt) {
query: { presets: ['es2015'], cacheDirectory: true }
},
{ test: /\.json$/, loader: 'json-loader' },
{ test: /argon2-asm\.min\.js$/, loader: 'raw-loader' },
{ test: /argon2\.wasm$/, loader: 'base64-loader' },
{ test: /argon2\.min\.js/, loader: 'raw-loader' },
{ test: /\.scss$/, loader: 'raw-loader' }

17
app/scripts/util/kdbxweb-init.js
View File

@ -24,7 +24,7 @@ const KdbxwebInit = {
return Promise.resolve(this.runtimeModule);
}
if (!global.WebAssembly) {
return this.loadAsmJsFallbackRuntime();
return Promise.reject('WebAssembly is not supported');
}
return new Promise((resolve, reject) => {
const loadTimeout = setTimeout(() => reject('timeout'), 1000);
@ -115,21 +115,6 @@ const KdbxwebInit = {
};
},
loadAsmJsFallbackRuntime() {
logger.debug('Loading asm.js fallback runtime');
return new Promise(resolve => {
const ts = logger.ts();
global.Module = undefined;
const argon2Code = require('argon2-asm');
global.eval(argon2Code); // eslint-disable-line
this.runtimeModule = {
hash: args => Promise.resolve().then(() => this.calcHash(global.Module, args))
};
logger.debug('Fallback runtime loaded', logger.ts(ts));
resolve(this.runtimeModule);
});
},
calcHash(Module, args) {
let { password, salt } = args;
const { memory, iterations, length, parallelism, type, version } = args;