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

Use separate nettle aes context for encryption and decryption

Browse Source 
So it can be used and validated by different threads at the same time
This commit is contained in:
Benau 2018-09-18 14:25:55 +08:00
parent 0cd8c03bcd
commit 07ad8977dd
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/network/crypto_nettle.cpp
View File

@ -74,9 +74,9 @@ std::string Crypto::m_client_iv;
bool Crypto::encryptConnectionRequest(BareNetworkString& ns) bool Crypto::encryptConnectionRequest(BareNetworkString& ns)
{ {
std::vector<uint8_t> cipher(ns.m_buffer.size() + 4, 0); std::vector<uint8_t> cipher(ns.m_buffer.size() + 4, 0);
gcm_aes128_encrypt(&m_aes_context, ns.m_buffer.size(), cipher.data() + 4, gcm_aes128_encrypt(&m_aes_encrypt_context, ns.m_buffer.size(),
ns.m_buffer.data()); cipher.data() + 4, ns.m_buffer.data());
gcm_aes128_digest(&m_aes_context, 4, cipher.data()); gcm_aes128_digest(&m_aes_encrypt_context, 4, cipher.data());
std::swap(ns.m_buffer, cipher); std::swap(ns.m_buffer, cipher);
return true; return true;
} // encryptConnectionRequest } // encryptConnectionRequest
@ -88,9 +88,9 @@ bool Crypto::decryptConnectionRequest(BareNetworkString& ns)
uint8_t* tag = ns.m_buffer.data(); uint8_t* tag = ns.m_buffer.data();
std::array<uint8_t, 4> tag_after = {}; std::array<uint8_t, 4> tag_after = {};
gcm_aes128_decrypt(&m_aes_context, ns.m_buffer.size() - 4, pt.data(), gcm_aes128_decrypt(&m_aes_decrypt_context, ns.m_buffer.size() - 4,
ns.m_buffer.data() + 4); pt.data(), ns.m_buffer.data() + 4);
gcm_aes128_digest(&m_aes_context, 4, tag_after.data()); gcm_aes128_digest(&m_aes_decrypt_context, 4, tag_after.data());
handleAuthentication(tag, tag_after); handleAuthentication(tag, tag_after);
std::swap(ns.m_buffer, pt); std::swap(ns.m_buffer, pt);
@ -119,10 +119,10 @@ ENetPacket* Crypto::encryptSend(BareNetworkString& ns, bool reliable)
uint8_t* packet_start = p->data + 8; uint8_t* packet_start = p->data + 8;
gcm_aes128_set_iv(&m_aes_context, 12, iv.data()); gcm_aes128_set_iv(&m_aes_encrypt_context, 12, iv.data());
gcm_aes128_encrypt(&m_aes_context, ns.m_buffer.size(), packet_start, gcm_aes128_encrypt(&m_aes_encrypt_context, ns.m_buffer.size(),
ns.m_buffer.data()); packet_start, ns.m_buffer.data());
gcm_aes128_digest(&m_aes_context, 4, p->data + 4); gcm_aes128_digest(&m_aes_encrypt_context, 4, p->data + 4);
ul.unlock(); ul.unlock();
memcpy(p->data, &val, 4); memcpy(p->data, &val, 4);
@ -145,10 +145,10 @@ NetworkString* Crypto::decryptRecieve(ENetPacket* p)
uint8_t* tag = p->data + 4; uint8_t* tag = p->data + 4;
std::array<uint8_t, 4> tag_after = {}; std::array<uint8_t, 4> tag_after = {};
gcm_aes128_set_iv(&m_aes_context, 12, iv.data()); gcm_aes128_set_iv(&m_aes_decrypt_context, 12, iv.data());
gcm_aes128_decrypt(&m_aes_context, clen, ns->m_buffer.data(), gcm_aes128_decrypt(&m_aes_decrypt_context, clen, ns->m_buffer.data(),
packet_start); packet_start);
gcm_aes128_digest(&m_aes_context, 4, tag_after.data()); gcm_aes128_digest(&m_aes_decrypt_context, 4, tag_after.data());
handleAuthentication(tag, tag_after); handleAuthentication(tag, tag_after);
NetworkString* result = ns.get(); NetworkString* result = ns.get();

8
src/network/crypto_nettle.hpp
View File

@ -50,7 +50,7 @@ private:
uint32_t m_packet_counter; uint32_t m_packet_counter;
struct gcm_aes128_ctx m_aes_context; struct gcm_aes128_ctx m_aes_encrypt_context, m_aes_decrypt_context;
std::mutex m_crypto_mutex; std::mutex m_crypto_mutex;
@ -132,8 +132,10 @@ public:
assert(iv.size() == 12); assert(iv.size() == 12);
std::copy_n(iv.begin(), 12, m_iv.begin()); std::copy_n(iv.begin(), 12, m_iv.begin());
m_packet_counter = 0; m_packet_counter = 0;
gcm_aes128_set_key(&m_aes_context, key.data()); gcm_aes128_set_key(&m_aes_encrypt_context, key.data());
gcm_aes128_set_iv(&m_aes_context, 12, iv.data()); gcm_aes128_set_iv(&m_aes_encrypt_context, 12, iv.data());
gcm_aes128_set_key(&m_aes_decrypt_context, key.data());
gcm_aes128_set_iv(&m_aes_decrypt_context, 12, iv.data());
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
bool encryptConnectionRequest(BareNetworkString& ns); bool encryptConnectionRequest(BareNetworkString& ns);