stephenseo/UDPConnection
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages 1 Wiki Activity Actions

Fix usage of atomic_bool "keysSet"

Browse source
This commit is contained in:
Stephen Seo 2020-01-05 15:31:37 +09:00
parent 1ecf9bff4f
commit 88ba670ce9
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/UDPConnection.cpp
View file

@ -288,7 +288,7 @@ void UDPC::Context::update_impl() {
{ {
unsigned char *sk = nullptr; unsigned char *sk = nullptr;
unsigned char *pk = nullptr; unsigned char *pk = nullptr;
if(keysSet.load(std::memory_order_relaxed)) { if(keysSet.load()) {
sk = this->sk; sk = this->sk;
pk = this->pk; pk = this->pk;
} }
@ -1206,7 +1206,7 @@ void UDPC::Context::update_impl() {
} }
unsigned char *sk = nullptr; unsigned char *sk = nullptr;
unsigned char *pk = nullptr; unsigned char *pk = nullptr;
if(keysSet.load(std::memory_order_relaxed)) { if(keysSet.load()) {
sk = this->sk; sk = this->sk;
pk = this->pk; pk = this->pk;
} }
@ -2303,7 +2303,6 @@ int UDPC_set_libsodium_keys(UDPC_HContext ctx, unsigned char *sk, unsigned char
return 0; return 0;
} }
std::lock_guard<std::mutex> lock(c->conMapMutex);
std::memcpy(c->sk, sk, crypto_sign_SECRETKEYBYTES); std::memcpy(c->sk, sk, crypto_sign_SECRETKEYBYTES);
std::memcpy(c->pk, pk, crypto_sign_PUBLICKEYBYTES); std::memcpy(c->pk, pk, crypto_sign_PUBLICKEYBYTES);
c->keysSet.store(true); c->keysSet.store(true);
@ -2324,7 +2323,6 @@ int UDPC_unset_libsodium_keys(UDPC_HContext ctx) {
return 0; return 0;
} }
std::lock_guard<std::mutex> lock(c->conMapMutex);
c->keysSet.store(false); c->keysSet.store(false);
std::memset(c->pk, 0, crypto_sign_PUBLICKEYBYTES); std::memset(c->pk, 0, crypto_sign_PUBLICKEYBYTES);
std::memset(c->sk, 0, crypto_sign_SECRETKEYBYTES); std::memset(c->sk, 0, crypto_sign_SECRETKEYBYTES);