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

Add support for OAEP SHA1 digest.

Browse Source 
Note that iOS does not support any other OAEP format, such as SHA256.
This commit is contained in:
Kyle Spearrin 2017-04-21 13:46:07 -04:00
parent 053a1c1394
commit e010995b19
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/constants.js
View File

@ -5,7 +5,8 @@ angular.module('bit')
AesCbc256_B64: 0,
AesCbc128_HmacSha256_B64: 1,
AesCbc256_HmacSha256_B64: 2,
RsaOaep_Sha256_B64: 3
Rsa2048_OaepSha256_B64: 3,
Rsa2048_OaepSha1_B64: 4
},
orgUserType: {
owner: 0,

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

@ -293,10 +293,10 @@ angular
}
var encryptedBytes = publicKey.encrypt(plainValue, 'RSA-OAEP', {
md: forge.md.sha256.create()
md: forge.md.sha1.create()
});
return constants.encType.RsaOaep_Sha256_B64 + '.' + forge.util.encode64(encryptedBytes);
return constants.encType.Rsa2048_OaepSha1_B64 + '.' + forge.util.encode64(encryptedBytes);
};
_service.decrypt = function (encValue, key, outputEncoding) {
@ -388,7 +388,7 @@ angular
encPiece;
if (headerPieces.length === 1) {
encType = constants.encType.RsaOaep_Sha256_B64;
encType = constants.encType.Rsa2048_OaepSha256_B64;
encPiece = headerPieces[0];
}
else if (headerPieces.length === 2) {
@ -401,13 +401,21 @@ angular
}
}
if (encType !== constants.encType.RsaOaep_Sha256_B64) {
return null;
var ctBytes = forge.util.decode64(encPiece);
var md;
if (encType === constants.encType.Rsa2048_OaepSha256_B64) {
md = forge.md.sha256.create();
}
else if (encType === constants.encType.Rsa2048_OaepSha1_B64) {
md = forge.md.sha1.create();
}
else {
throw 'encType unavailable.';
}
var ctBytes = forge.util.decode64(encPiece);
var decBytes = privateKey.decrypt(ctBytes, 'RSA-OAEP', {
md: forge.md.sha256.create()
md: md
});
return decBytes;