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

Binlog: store iv, key and key_hash in string instead of BufferSlice.

Browse Source
This commit is contained in:
levlam 2023-02-02 00:26:12 +03:00
parent 3d6ea2f779
commit 2a5f6121ef
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tddb/td/db/binlog/Binlog.cpp
View File

@ -52,23 +52,23 @@ struct AesCtrEncryptionEvent {
} }
string key_salt_; string key_salt_;
BufferSlice iv_; string iv_;
BufferSlice key_hash_; string key_hash_;
BufferSlice generate_key(const DbKey &db_key) const { string generate_key(const DbKey &db_key) const {
CHECK(!db_key.is_empty()); CHECK(!db_key.is_empty());
BufferSlice key(key_size()); string key(key_size(), '\0');
size_t iteration_count = kdf_iteration_count(); size_t iteration_count = kdf_iteration_count();
if (db_key.is_raw_key()) { if (db_key.is_raw_key()) {
iteration_count = kdf_fast_iteration_count(); iteration_count = kdf_fast_iteration_count();
} }
pbkdf2_sha256(db_key.data(), key_salt_, narrow_cast<int>(iteration_count), key.as_slice()); pbkdf2_sha256(db_key.data(), key_salt_, narrow_cast<int>(iteration_count), key);
return key; return key;
} }
static BufferSlice generate_hash(Slice key) { static string generate_hash(Slice key) {
BufferSlice hash(hash_size()); string hash(hash_size(), '\0');
hmac_sha256(key, "cucumbers everywhere", hash.as_slice()); hmac_sha256(key, "cucumbers everywhere", hash);
return hash; return hash;
} }
@ -347,20 +347,18 @@ void Binlog::do_event(BinlogEvent &&event) {
detail::AesCtrEncryptionEvent encryption_event; detail::AesCtrEncryptionEvent encryption_event;
encryption_event.parse(TlParser(event.data_)); encryption_event.parse(TlParser(event.data_));
BufferSlice key; string key;
if (aes_ctr_key_salt_ == encryption_event.key_salt_) { if (aes_ctr_key_salt_ == encryption_event.key_salt_) {
key = BufferSlice(as_slice(aes_ctr_key_)); key = as_slice(aes_ctr_key_).str();
} else if (!db_key_.is_empty()) { } else if (!db_key_.is_empty()) {
key = encryption_event.generate_key(db_key_); key = encryption_event.generate_key(db_key_);
} }
if (detail::AesCtrEncryptionEvent::generate_hash(key.as_slice()).as_slice() != if (detail::AesCtrEncryptionEvent::generate_hash(key) != encryption_event.key_hash_) {
encryption_event.key_hash_.as_slice()) {
CHECK(state_ == State::Load); CHECK(state_ == State::Load);
if (!old_db_key_.is_empty()) { if (!old_db_key_.is_empty()) {
key = encryption_event.generate_key(old_db_key_); key = encryption_event.generate_key(old_db_key_);
if (detail::AesCtrEncryptionEvent::generate_hash(key.as_slice()).as_slice() != if (detail::AesCtrEncryptionEvent::generate_hash(key) != encryption_event.key_hash_) {
encryption_event.key_hash_.as_slice()) {
info_.wrong_password = true; info_.wrong_password = true;
} }
} else { } else {
@ -373,7 +371,7 @@ void Binlog::do_event(BinlogEvent &&event) {
encryption_type_ = EncryptionType::AesCtr; encryption_type_ = EncryptionType::AesCtr;
aes_ctr_key_salt_ = encryption_event.key_salt_; aes_ctr_key_salt_ = encryption_event.key_salt_;
update_encryption(key.as_slice(), encryption_event.iv_.as_slice()); update_encryption(key, encryption_event.iv_);
if (state_ == State::Load) { if (state_ == State::Load) {
update_read_encryption(); update_read_encryption();
@ -602,17 +600,17 @@ void Binlog::reset_encryption() {
} else { } else {
event.key_salt_ = aes_ctr_key_salt_; event.key_salt_ = aes_ctr_key_salt_;
} }
event.iv_ = BufferSlice(EncryptionEvent::iv_size()); event.iv_.resize(EncryptionEvent::iv_size());
Random::secure_bytes(event.iv_.as_slice()); Random::secure_bytes(event.iv_);
BufferSlice key; string key;
if (aes_ctr_key_salt_ == event.key_salt_) { if (aes_ctr_key_salt_ == event.key_salt_) {
key = BufferSlice(as_slice(aes_ctr_key_)); key = as_slice(aes_ctr_key_).str();
} else { } else {
key = event.generate_key(db_key_); key = event.generate_key(db_key_);
} }
event.key_hash_ = EncryptionEvent::generate_hash(key.as_slice()); event.key_hash_ = EncryptionEvent::generate_hash(key);
do_event(BinlogEvent( do_event(BinlogEvent(
BinlogEvent::create_raw(0, BinlogEvent::ServiceTypes::AesCtrEncryption, 0, create_default_storer(event)), BinlogEvent::create_raw(0, BinlogEvent::ServiceTypes::AesCtrEncryption, 0, create_default_storer(event)),