andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Make FileEncryptionKey fields private.

Browse Source 
GitOrigin-RevId: 06ec5e24b9154e1830fd3d37b833df60609c675a
This commit is contained in:
levlam 2019-10-24 20:17:37 +03:00
parent 0d375251a4
commit a0fa744735
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
td/telegram/files/FileEncryptionKey.h
View File

@ -86,14 +86,15 @@ struct FileEncryptionKey {
} }
} }
friend bool operator==(const FileEncryptionKey &lhs, const FileEncryptionKey &rhs) {
return lhs.key_iv_ == rhs.key_iv_;
}
private:
string key_iv_; // TODO wrong alignment is possible string key_iv_; // TODO wrong alignment is possible
Type type_ = Type::None; Type type_ = Type::None;
}; };
inline bool operator==(const FileEncryptionKey &lhs, const FileEncryptionKey &rhs) {
return lhs.key_iv_ == rhs.key_iv_;
}
inline bool operator!=(const FileEncryptionKey &lhs, const FileEncryptionKey &rhs) { inline bool operator!=(const FileEncryptionKey &lhs, const FileEncryptionKey &rhs) {
return !(lhs == rhs); return !(lhs == rhs);
} }

2
td/telegram/files/FileManager.cpp
View File

@ -1278,7 +1278,7 @@ static int merge_choose_encryption_key(const FileEncryptionKey &a, const FileEnc
if (a.empty() != b.empty()) { if (a.empty() != b.empty()) {
return a.empty() > b.empty(); return a.empty() > b.empty();
} }
if (a.key_iv_ != b.key_iv_) { if (a != b) {
return -1; return -1;
} }
return 2; return 2;