mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "perf: recycle Diffie-Hellman keys iff peer was unreachable (#4408)" 

This reverts commit 35a0211118.
This commit is contained in:
Charles Kerr 2022-12-19 15:12:33 -06:00
parent 35a0211118
commit 5743758edd
3 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libtransmission/handshake.cc
View File

@ -833,8 +833,6 @@ void tr_handshake::on_error(tr_peerIo* io, tr_error const& error, void* vhandsha
bool tr_handshake::fire_done(bool is_connected)
{
maybe_recycle_dh();
if (!on_done_)
{
return false;
@ -912,7 +910,7 @@ uint32_t tr_handshake::crypto_provide() const noexcept
**/
tr_handshake::tr_handshake(Mediator* mediator, std::shared_ptr<tr_peerIo> peer_io, tr_encryption_mode mode, DoneFunc on_done)
: dh_{ tr_handshake::get_dh(mediator) }
: dh_{ mediator->private_key() }
, on_done_{ std::move(on_done) }
, peer_io_{ std::move(peer_io) }
, timeout_timer_{ mediator->timer_maker().create([this]() { fire_done(false); }) }

46
libtransmission/handshake.h
View File

@ -16,7 +16,6 @@
#include <cstddef> // for std::byte, size_t
#include <functional>
#include <memory>
#include <mutex>
#include <optional>
#include <string_view>
@ -249,51 +248,6 @@ private:
using vc_t = std::array<std::byte, 8>;
static auto constexpr VC = vc_t{};
/// DH pool. Keys are expensive, so we recycle them iff the peer was unreachable
static constexpr auto DhPoolMaxSize = size_t{ 32 };
static inline auto dh_pool_size_ = size_t{};
static inline auto dh_pool_ = std::array<tr_message_stream_encryption::DH, DhPoolMaxSize>{};
static inline auto dh_pool_mutex_ = std::mutex{};
[[nodiscard]] static DH get_dh(Mediator* mediator)
{
auto lock = std::unique_lock(dh_pool_mutex_);
if (dh_pool_size_ > 0U)
{
auto dh = DH{};
std::swap(dh, dh_pool_[dh_pool_size_]);
--dh_pool_size_;
return dh;
}
return DH{ mediator->private_key() };
}
static void add_dh(DH&& dh)
{
auto lock = std::unique_lock(dh_pool_mutex_);
if (dh_pool_size_ < std::size(dh_pool_))
{
dh_pool_[dh_pool_size_] = std::move(dh);
++dh_pool_size_;
}
}
void maybe_recycle_dh()
{
if (have_read_anything_from_peer_)
{
return;
}
auto dh = DH{};
std::swap(dh_, dh);
add_dh(std::move(dh));
}
///
DH dh_ = {};

2
libtransmission/peer-mse.h
View File

@ -70,7 +70,7 @@ public:
[[nodiscard]] static private_key_bigend_t randomPrivateKey() noexcept;
private:
private_key_bigend_t private_key_;
private_key_bigend_t const private_key_;
key_bigend_t public_key_ = {};
key_bigend_t secret_ = {};
};