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

cryptography draft fixes

Browse Source
This commit is contained in:
Arseny Smirnov 2021-02-24 18:43:09 +03:00
parent 9c478e21e7
commit 143846f09b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/crypto.cpp
View File

@ -15,7 +15,6 @@
#include "td/mtproto/KDF.h" #include "td/mtproto/KDF.h"
#include "td/mtproto/Transport.h" #include "td/mtproto/Transport.h"
class Handshake { class Handshake {
public: public:
struct KeyPair { struct KeyPair {
@ -184,13 +183,19 @@ void KDF2(Slice auth_key, const UInt128 &msg_key, int X, UInt256 *aes_key, UInt1
aes_iv_slice.substr(4).copy_from(sha256_a.substr(8, 8)); aes_iv_slice.substr(4).copy_from(sha256_a.substr(8, 8));
aes_iv_slice.substr(12).copy_from(sha256_b.substr(24, 4)); aes_iv_slice.substr(12).copy_from(sha256_b.substr(24, 4));
} }
} } // namespace td
td::SecureString encrypt(td::Slice key, td::Slice data, td::int32 seqno, int X) { td::SecureString encrypt(td::Slice key, td::Slice data, td::int32 seqno, int X) {
td::SecureString res(data.size() + 4 + 16); td::SecureString res(data.size() + 4 + 16);
res.as_mutable_slice().substr(20).copy_from(data); res.as_mutable_slice().substr(20).copy_from(data);
td::TlStorerUnsafe storer(res.as_mutable_slice().substr(16).ubegin());
storer.store_int(seqno); // big endian
td::uint8 *ptr = res.as_mutable_slice().substr(16).ubegin();
ptr[0] = (seqno >> 24) & 255;
ptr[1] = (seqno >> 16) & 255;
ptr[2] = (seqno >> 8) & 255;
ptr[3] = (seqno)&255;
td::mtproto::AuthKey auth_key(0, key.str()); td::mtproto::AuthKey auth_key(0, key.str());
auto payload = res.as_mutable_slice().substr(16); auto payload = res.as_mutable_slice().substr(16);
td::UInt128 msg_key = td::mtproto::Transport::calc_message_key2(auth_key, X, payload).second; td::UInt128 msg_key = td::mtproto::Transport::calc_message_key2(auth_key, X, payload).second;
@ -214,7 +219,6 @@ HandshakeTest gen_test() {
return res; return res;
} }
void run_test(const HandshakeTest &test) { void run_test(const HandshakeTest &test) {
auto alice_secret = Handshake::calc_shared_secret(test.alice.private_key, test.bob.public_key).move_as_ok(); auto alice_secret = Handshake::calc_shared_secret(test.alice.private_key, test.bob.public_key).move_as_ok();
auto bob_secret = Handshake::calc_shared_secret(test.bob.private_key, test.alice.public_key).move_as_ok(); auto bob_secret = Handshake::calc_shared_secret(test.bob.private_key, test.alice.public_key).move_as_ok();
@ -255,7 +259,6 @@ HandshakeTest pregenerated_test() {
"HYe8tJdEwHcmlnXq7LtprigzExaNJS7skfOo2irClj-7EL06-jMrhfwngSJFsak8JFSw8s6R4fwCsr50") "HYe8tJdEwHcmlnXq7LtprigzExaNJS7skfOo2irClj-7EL06-jMrhfwngSJFsak8JFSw8s6R4fwCsr50")
.move_as_ok(); .move_as_ok();
return test; return test;
} }