colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare equality w/o getString (in the future)

Browse Source
This commit is contained in:
Matt Corallo
2014-07-20 22:06:04 -04:00
parent 1d2e252595
commit 4c3ee6f23b
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/crypto.js
View File

@@ -352,18 +352,14 @@ window.textsecure.crypto = function() {
var verifyMACWithVersionByte = function(data, key, mac, version) {
return calculateMACWithVersionByte(data, key, version).then(function(calculated_mac) {
var macString = getString(mac);//TODO: Move away from strings for comparison?
if (getString(calculated_mac).substring(0, macString.length) != macString)
if (!isEqual(calculated_mac, mac, mac.byteLength))
throw new Error("Bad MAC");
});
}
var verifyMAC = function(data, key, mac) {
return HmacSHA256(key, data).then(function(calculated_mac) {
var macString = getString(mac);//TODO: Move away from strings for comparison?
if (getString(calculated_mac).substring(0, macString.length) != macString)
if (!isEqual(calculated_mac, mac, mac.byteLength))
throw new Error("Bad MAC");
});
}