tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve AesIgeState.

Browse Source 
GitOrigin-RevId: b0a1d8bad4be32e4f6fa9ff36f5a5bef2c464b26
This commit is contained in:
levlam 2020-06-16 01:32:08 +03:00
parent e1515226be
commit 40ee207854
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/bench_crypto.cpp
View File

@ -348,8 +348,8 @@ int main() {
td::bench(AesIgeEncryptBench());
td::bench(AesIgeDecryptBench());
td::bench(AesCtrBench());
td::bench(AesEcbBench());
td::bench(AesCtrBench());
td::bench(AesIgeShortBench());
td::bench(Pbkdf2Bench());

46
tdutils/td/utils/crypto.cpp
View File

@ -453,8 +453,8 @@ void aes_ige_decrypt(Slice aes_key, MutableSlice aes_iv, Slice from, MutableSlic
class AesIgeState::Impl {
public:
AesState state;
AesBlock iv;
AesBlock iv2;
AesBlock encrypted_iv;
AesBlock plaintext_iv;
void encrypt(Slice from, MutableSlice to) {
CHECK(from.size() % AES_BLOCK_SIZE == 0);
@ -463,18 +463,18 @@ class AesIgeState::Impl {
auto in = from.ubegin();
auto out = to.ubegin();
AesBlock tmp;
AesBlock tmp2;
AesBlock plaintext;
while (len) {
tmp.load(in);
tmp2 = tmp ^ iv;
state.encrypt(tmp2.raw(), tmp2.raw(), AES_BLOCK_SIZE);
plaintext.load(in);
encrypted_iv ^= plaintext;
state.encrypt(encrypted_iv.raw(), encrypted_iv.raw(), AES_BLOCK_SIZE);
encrypted_iv ^= plaintext_iv;
encrypted_iv.store(out);
plaintext_iv = plaintext;
tmp2 ^= iv2;
tmp2.store(out);
iv = tmp2;
iv2 = tmp;
--len;
in += AES_BLOCK_SIZE;
out += AES_BLOCK_SIZE;
@ -488,18 +488,18 @@ class AesIgeState::Impl {
auto in = from.ubegin();
auto out = to.ubegin();
AesBlock tmp;
AesBlock tmp2;
AesBlock encrypted;
while (len) {
tmp.load(in);
tmp2 = tmp;
tmp ^= iv2;
state.decrypt(tmp.raw(), tmp.raw(), AES_BLOCK_SIZE);
tmp ^= iv;
tmp.store(out);
iv = tmp2;
iv2 = tmp;
encrypted.load(in);
plaintext_iv ^= encrypted;
state.decrypt(plaintext_iv.raw(), plaintext_iv.raw(), AES_BLOCK_SIZE);
plaintext_iv ^= encrypted_iv;
plaintext_iv.store(out);
encrypted_iv = encrypted;
--len;
in += AES_BLOCK_SIZE;
out += AES_BLOCK_SIZE;
@ -517,8 +517,8 @@ void AesIgeState::init(Slice key, Slice iv, bool encrypt) {
impl_ = make_unique<Impl>();
}
impl_->state.init(key, encrypt);
impl_->iv.load(iv.ubegin());
impl_->iv2.load(iv.ubegin() + AES_BLOCK_SIZE);
impl_->encrypted_iv.load(iv.ubegin());
impl_->plaintext_iv.load(iv.ubegin() + AES_BLOCK_SIZE);
}
void AesIgeState::encrypt(Slice from, MutableSlice to) {