highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-06 03:02:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

tor, fuzz: reuse constants instead of duplicating

Browse Source 
`src/torcontrol.cpp` used to define some constants that are used
explicitly in `src/torcontrol.cpp` and implicitly in
`src/test/fuzz/torcontrol.cpp` by duplicating their values.

Move the constants to `src/torcontrol.h` and reuse them in
`src/test/fuzz/torcontrol.cpp` to avoid duplication and magic
numbers.
This commit is contained in:
Vasil Dimov
2026-02-19 12:03:18 +01:00
parent 8ee24d764a
commit fb993f7604
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/fuzz/torcontrol.cpp
View File

@@ -49,10 +49,10 @@ FUZZ_TARGET(torcontrol, .init = initialize_torcontrol)
CallOneOf( CallOneOf(
fuzzed_data_provider, fuzzed_data_provider,
[&] { [&] {
tor_control_reply.code = 250; tor_control_reply.code = TOR_REPLY_OK;
}, },
[&] { [&] {
tor_control_reply.code = 510; tor_control_reply.code = TOR_REPLY_UNRECOGNIZED;
}, },
[&] { [&] {
tor_control_reply.code = fuzzed_data_provider.ConsumeIntegral<int>(); tor_control_reply.code = fuzzed_data_provider.ConsumeIntegral<int>();

3
src/torcontrol.cpp
View File

@@ -53,9 +53,6 @@ const std::string DEFAULT_TOR_CONTROL = "127.0.0.1:" + ToString(DEFAULT_TOR_CONT
static const int TOR_COOKIE_SIZE = 32; static const int TOR_COOKIE_SIZE = 32;
/** Size of client/server nonce for SAFECOOKIE */ /** Size of client/server nonce for SAFECOOKIE */
static const int TOR_NONCE_SIZE = 32; static const int TOR_NONCE_SIZE = 32;
/** Tor control reply code. Ref: https://spec.torproject.org/control-spec/replies.html */
static const int TOR_REPLY_OK = 250;
static const int TOR_REPLY_UNRECOGNIZED = 510;
/** For computing serverHash in SAFECOOKIE */ /** For computing serverHash in SAFECOOKIE */
static const std::string TOR_SAFE_SERVERKEY = "Tor safe cookie authentication server-to-controller hash"; static const std::string TOR_SAFE_SERVERKEY = "Tor safe cookie authentication server-to-controller hash";
/** For computing clientHash in SAFECOOKIE */ /** For computing clientHash in SAFECOOKIE */

4
src/torcontrol.h
View File

@@ -24,6 +24,10 @@ constexpr int DEFAULT_TOR_CONTROL_PORT = 9051;
extern const std::string DEFAULT_TOR_CONTROL; extern const std::string DEFAULT_TOR_CONTROL;
static const bool DEFAULT_LISTEN_ONION = true; static const bool DEFAULT_LISTEN_ONION = true;
/** Tor control reply code. Ref: https://spec.torproject.org/control-spec/replies.html */
constexpr int TOR_REPLY_OK{250};
constexpr int TOR_REPLY_UNRECOGNIZED{510};
void StartTorControl(CService onion_service_target); void StartTorControl(CService onion_service_target);
void InterruptTorControl(); void InterruptTorControl();
void StopTorControl(); void StopTorControl();