Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-25 16:59:17 +01:00
Code Issues Projects Releases Wiki Activity

handle legacy encrypt-then-mac scheme

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-19 16:45:16 -04:00
parent cb120d2e75
commit 7627601ff8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ angular
.factory('cryptoService', function ($sessionStorage, constants, $q) {
var _service = {},
_key,
_legacyEtmKey,
_orgKeys,
_privateKey,
_publicKey;
@ -168,6 +169,7 @@ angular
_service.clearKey = function () {
_key = null;
_legacyEtmKey = null;
delete $sessionStorage.key;
};
@ -314,8 +316,15 @@ angular
}
}
else {
encType = constants.encType.AesCbc256_B64;
encPieces = encValue.split('|');
encType = encPieces.length === 3 ? constants.encType.AesCbc128_HmacSha256_B64 :
constants.encType.AesCbc256_B64;
}
if (encType === constants.encType.AesCbc128_HmacSha256_B64 && key.encType === constants.encType.AesCbc256_B64) {
// Old encrypt-then-mac scheme, swap out the key
_legacyEtmKey = _legacyEtmKey || new CryptoKey(key.key, false, constants.encType.AesCbc128_HmacSha256_B64);
key = _legacyEtmKey;
}
if (encType !== key.encType) {