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

Don't use EVP_aes_256_ctr before OpenSSL 1.1.0.

Browse Source
This commit is contained in:
levlam 2020-11-20 02:18:12 +03:00
parent ea6cdde0c5
commit 34cf869c02
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
benchmark/bench_crypto.cpp
View File

@ -166,6 +166,7 @@ class AesCtrBench : public td::Benchmark {
}
};
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
class AesCtrOpenSSLBench : public td::Benchmark {
public:
alignas(64) unsigned char data[DATA_SIZE];
@ -200,6 +201,7 @@ class AesCtrOpenSSLBench : public td::Benchmark {
EVP_CIPHER_CTX_free(ctx);
}
};
#endif
class AesCbcDecryptBench : public td::Benchmark {
public:
@ -410,7 +412,9 @@ class Crc64Bench : public td::Benchmark {
int main() {
td::init_openssl_threads();
td::bench(AesCtrBench());
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
td::bench(AesCtrOpenSSLBench());
#endif
td::bench(AesCbcDecryptBench());
td::bench(AesCbcEncryptBench());

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

@ -341,9 +341,11 @@ class Evp {
init(Type::Cbc, false, EVP_aes_256_cbc(), key);
}
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
void init_encrypt_ctr(Slice key) {
init(Type::Ctr, true, EVP_aes_256_ctr(), key);
}
#endif
void init_iv(Slice iv) {
int res = EVP_CipherInit_ex(ctx_, nullptr, nullptr, nullptr, iv.ubegin(), -1);
@ -615,7 +617,14 @@ void AesCbcState::decrypt(Slice from, MutableSlice to) {
}
struct AesCtrState::Impl {
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
Evp evp_;
#else
AES_KEY aes_key_;
uint8 counter_[AES_BLOCK_SIZE];
uint8 encrypted_counter_[AES_BLOCK_SIZE];
uint8 current_pos_;
#endif
};
AesCtrState::AesCtrState() = default;
@ -627,13 +636,36 @@ void AesCtrState::init(Slice key, Slice iv) {
CHECK(key.size() == 32);
CHECK(iv.size() == 16);
ctx_ = make_unique<AesCtrState::Impl>();
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
ctx_->evp_.init_encrypt_ctr(key);
ctx_->evp_.init_iv(iv);
#else
if (AES_set_encrypt_key(key.ubegin(), 256, &ctx_->aes_key_) < 0) {
LOG(FATAL) << "Failed to set encrypt key";
}
MutableSlice(ctx_->counter_, AES_BLOCK_SIZE).copy_from(iv);
ctx_->current_pos_ = 0;
#endif
}
void AesCtrState::encrypt(Slice from, MutableSlice to) {
CHECK(from.size() <= to.size());
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
ctx_->evp_.encrypt(from.ubegin(), to.ubegin(), narrow_cast<int>(from.size()));
#else
for (size_t i = 0; i < from.size(); i++) {
if (ctx_->current_pos_ == 0) {
AES_encrypt(ctx_->counter_, ctx_->encrypted_counter_, &ctx_->aes_key_);
for (int j = 15; j >= 0; j--) {
if (++ctx_->counter_[j] != 0) {
break;
}
}
}
to[i] = from[i] ^ ctx_->encrypted_counter_[ctx_->current_pos_];
ctx_->current_pos_ = (ctx_->current_pos_ + 1) & 15;
}
#endif
}
void AesCtrState::decrypt(Slice from, MutableSlice to) {