vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

null check on subtle

This commit is contained in:
Kyle Spearrin 2018-05-05 21:28:34 -04:00
parent f0a986aa04
commit c326e03eb2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/services/cryptoService.js
View File

@ -235,7 +235,7 @@ angular
}; };
_service.makeKey = function (password, salt) { _service.makeKey = function (password, salt) {
if (!$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) { if (_subtle != null && !$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) {
return pbkdf2WC(password, salt, 5000, 256).then(function (keyBuf) { return pbkdf2WC(password, salt, 5000, 256).then(function (keyBuf) {
return new SymmetricCryptoKey(bufToB64(keyBuf), true); return new SymmetricCryptoKey(bufToB64(keyBuf), true);
}); });
@ -305,7 +305,7 @@ angular
throw 'Invalid parameters.'; throw 'Invalid parameters.';
} }
if (!$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) { if (_subtle != null && !$window.cryptoShimmed && $window.navigator.userAgent.indexOf('Edge') === -1) {
var keyBuf = key.getBuffers(); var keyBuf = key.getBuffers();
return pbkdf2WC(new Uint8Array(keyBuf.key), password, 1, 256).then(function (hashBuf) { return pbkdf2WC(new Uint8Array(keyBuf.key), password, 1, 256).then(function (hashBuf) {
return bufToB64(hashBuf); return bufToB64(hashBuf);