Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-06 09:20:43 +01:00
Code Issues Projects Releases Wiki Activity

cleanup crypto API

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-19 09:27:38 -04:00
parent 6d555bcf84
commit 051703234c
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,9 +37,10 @@ angular
for (var orgId in orgKeysCt) { for (var orgId in orgKeysCt) {
if (orgKeysCt.hasOwnProperty(orgId)) { if (orgKeysCt.hasOwnProperty(orgId)) {
try { try {
var orgKey = new CryptoKey(_service.rsaDecrypt(orgKeysCt[orgId].key, privateKey)); var decBytes = _service.rsaDecrypt(orgKeysCt[orgId].key, privateKey);
_orgKeys[orgId] = orgKey; var decKey = new CryptoKey(decBytes);
orgKeysb64[orgId] = orgKey.keyB64; _orgKeys[orgId] = decKey;
orgKeysb64[orgId] = decKey.keyB64;
setKey = true; setKey = true;
} }
catch (e) { catch (e) {
@ -68,9 +69,10 @@ angular
} }
try { try {
var decOrgKey = new CryptoKey(_service.rsaDecrypt(encOrgKey, privateKey)); var decBytes = _service.rsaDecrypt(encOrgKey, privateKey);
_orgKeys[orgId] = decOrgKey; var decKey = new CryptoKey(decBytes);
orgKeysb64[orgId] = decOrgKey.keyB64; _orgKeys[orgId] = decKey;
orgKeysb64[orgId] = decKey.keyB64;
} }
catch (e) { catch (e) {
_orgKeys = null; _orgKeys = null;
@ -82,7 +84,7 @@ angular
_service.getKey = function () { _service.getKey = function () {
if (!_key && $sessionStorage.key) { if (!_key && $sessionStorage.key) {
_key = new CryptoKey($sessionStorage.key, null, true); _key = new CryptoKey($sessionStorage.key, true);
} }
if (!_key) { if (!_key) {
@ -142,7 +144,7 @@ angular
for (var orgId in $sessionStorage.orgKeys) { for (var orgId in $sessionStorage.orgKeys) {
if ($sessionStorage.orgKeys.hasOwnProperty(orgId)) { if ($sessionStorage.orgKeys.hasOwnProperty(orgId)) {
orgKeys[orgId] = new CryptoKey($sessionStorage.orgKeys[orgId], null, true); orgKeys[orgId] = new CryptoKey($sessionStorage.orgKeys[orgId], true);
setKey = true; setKey = true;
} }
} }
@ -410,7 +412,7 @@ angular
return forge.util.encode64(mac.getBytes()); return forge.util.encode64(mac.getBytes());
} }
function CryptoKey(keyBytes, encType, b64KeyBytes) { function CryptoKey(keyBytes, b64KeyBytes, encType) {
if (b64KeyBytes) { if (b64KeyBytes) {
keyBytes = forge.util.decode64(keyBytes); keyBytes = forge.util.decode64(keyBytes);
} }
@ -423,12 +425,13 @@ angular
if (!buffer || buffer.length() === 0) { if (!buffer || buffer.length() === 0) {
throw 'Couldn\'t make buffer'; throw 'Couldn\'t make buffer';
} }
var bufferLength = buffer.length();
if (encType === null || encType === undefined) { if (encType === null || encType === undefined) {
if (buffer.length() === 32) { if (bufferLength === 32) {
encType = constants.encType.AesCbc256_B64; encType = constants.encType.AesCbc256_B64;
} }
else if (buffer.length() === 64) { else if (bufferLength === 64) {
encType = constants.encType.AesCbc256_HmacSha256_B64; encType = constants.encType.AesCbc256_HmacSha256_B64;
} }
else { else {
@ -440,20 +443,20 @@ angular
this.keyB64 = forge.util.encode64(keyBytes); this.keyB64 = forge.util.encode64(keyBytes);
this.encType = encType; this.encType = encType;
if (encType === constants.encType.AesCbc256_B64 && buffer.length() === 32) { if (encType === constants.encType.AesCbc256_B64 && bufferLength === 32) {
this.encKey = keyBytes; this.encKey = keyBytes;
this.macKey = null; this.macKey = null;
} }
else if (encType === constants.encType.AesCbc128_HmacSha256_B64 && buffer.length() === 32) { else if (encType === constants.encType.AesCbc128_HmacSha256_B64 && bufferLength === 32) {
this.encKey = buffer.getBytes(16); // first half this.encKey = buffer.getBytes(16); // first half
this.macKey = buffer.getBytes(16); // second half this.macKey = buffer.getBytes(16); // second half
} }
else if (encType === constants.encType.AesCbc256_HmacSha256_B64 && buffer.length() === 64) { else if (encType === constants.encType.AesCbc256_HmacSha256_B64 && bufferLength === 64) {
this.encKey = buffer.getBytes(32); // first half this.encKey = buffer.getBytes(32); // first half
this.macKey = buffer.getBytes(32); // second half this.macKey = buffer.getBytes(32); // second half
} }
else { else {
throw 'Unsupported key.'; throw 'Unsupported encType/key length.';
} }
} }