ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the iv send in network order

Browse Source
This commit is contained in:
Benau
2019-03-14 11:38:58 +08:00
parent 8446ce9a5c
commit 324d72cc6f
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/network/crypto_nettle.cpp
View File

@@ -113,9 +113,19 @@ ENetPacket* Crypto::encryptSend(BareNetworkString& ns, bool reliable)
uint32_t val = ++m_packet_counter;
if (NetworkConfig::get()->isClient())
memcpy(iv.data(), &val, 4);
{
iv[0] = (val >> 24) & 0xff;
iv[1] = (val >> 16) & 0xff;
iv[2] = (val >> 8) & 0xff;
iv[3] = val & 0xff;
}
else
memcpy(iv.data() + 4, &val, 4);
{
iv[4] = (val >> 24) & 0xff;
iv[5] = (val >> 16) & 0xff;
iv[6] = (val >> 8) & 0xff;
iv[7] = val & 0xff;
}
uint8_t* packet_start = p->data + 8;
@@ -125,7 +135,10 @@ ENetPacket* Crypto::encryptSend(BareNetworkString& ns, bool reliable)
gcm_aes128_digest(&m_aes_encrypt_context, 4, p->data + 4);
ul.unlock();
memcpy(p->data, &val, 4);
p->data[0] = (val >> 24) & 0xff;
p->data[1] = (val >> 16) & 0xff;
p->data[2] = (val >> 8) & 0xff;
p->data[3] = val & 0xff;
return p;
} // encryptSend

19
src/network/crypto_openssl.cpp
View File

@@ -144,9 +144,19 @@ ENetPacket* Crypto::encryptSend(BareNetworkString& ns, bool reliable)
uint32_t val = ++m_packet_counter;
if (NetworkConfig::get()->isClient())
memcpy(iv.data(), &val, 4);
{
iv[0] = (val >> 24) & 0xff;
iv[1] = (val >> 16) & 0xff;
iv[2] = (val >> 8) & 0xff;
iv[3] = val & 0xff;
}
else
memcpy(iv.data() + 4, &val, 4);
{
iv[4] = (val >> 24) & 0xff;
iv[5] = (val >> 16) & 0xff;
iv[6] = (val >> 8) & 0xff;
iv[7] = val & 0xff;
}
uint8_t* packet_start = p->data + 8;
@@ -176,7 +186,10 @@ ENetPacket* Crypto::encryptSend(BareNetworkString& ns, bool reliable)
}
ul.unlock();
memcpy(p->data, &val, 4);
p->data[0] = (val >> 24) & 0xff;
p->data[1] = (val >> 16) & 0xff;
p->data[2] = (val >> 8) & 0xff;
p->data[3] = val & 0xff;
return p;
} // encryptSend