Break circuit earlier

There is no need to calculate the full checksum for an Tor v3 onion address if the version byte is not the expected one.
PastaPastaPasta · Nov 16, 2020 · d355a30 · d355a30
1 parent c48e788
commit d355a30
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -255,10 +255,14 @@ bool CNetAddr::SetSpecial(const std::string& str)
  Span<const uint8_t> input_checksum{input.data() + ADDR_TORV3_SIZE, torv3::CHECKSUM_LEN};
  Span<const uint8_t> input_version{input.data() + ADDR_TORV3_SIZE + torv3::CHECKSUM_LEN, sizeof(torv3::VERSION)};
 
+ if (input_version != torv3::VERSION) {
+ return false;
+ }
+
  uint8_t calculated_checksum[torv3::CHECKSUM_LEN];
  torv3::Checksum(input_pubkey, calculated_checksum);
 
- if (input_checksum != calculated_checksum || input_version != torv3::VERSION) {
+ if (input_checksum != calculated_checksum) {
  return false;
  }