exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

symkey: use hmac to fix possible collision attack

Browse source
This commit is contained in:
Mirek Kratochvil 2014-04-19 21:59:15 +02:00
parent 80aed3c476
commit 07012cb297
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/symkey.cpp
View file

@ -184,6 +184,8 @@ bool symkey::encrypt (std::istream&in, std::ostream&out, prng&rng)
hash_proc&hp = **i; hash_proc&hp = **i;
hp.init(); hp.init();
hp.eat (& (buf[0]), & (buf[4 + bytes_read]) ); hp.eat (& (buf[0]), & (buf[4 + bytes_read]) );
hp.eat (key);
hp.eat (otkey);
std::vector<byte> res = hp.finish(); std::vector<byte> res = hp.finish();
for (uint j = 0; j < res.size(); ++j, ++hashpos) for (uint j = 0; j < res.size(); ++j, ++hashpos)
buf[hashpos] = res[j]; buf[hashpos] = res[j];
@ -313,6 +315,8 @@ int symkey::decrypt (std::istream&in, std::ostream&out)
hash_proc&hp = **i; hash_proc&hp = **i;
hp.init(); hp.init();
hp.eat (& (buf[0]), & (buf[4 + bytes_read]) ); hp.eat (& (buf[0]), & (buf[4 + bytes_read]) );
hp.eat (key);
hp.eat (otkey);
std::vector<byte> res = hp.finish(); std::vector<byte> res = hp.finish();
for (uint j = 0; j < res.size(); ++j, ++hashpos) for (uint j = 0; j < res.size(); ++j, ++hashpos)
if (buf[hashpos] != res[j]) { if (buf[hashpos] != res[j]) {