Skip to content
Snippets Groups Projects
Commit a8b6f195 authored by Nick Mathewson's avatar Nick Mathewson :fire:
Browse files

Merge branch 'hs_handshake' into 'main'

Clean up hs_ntor.rs, add test vectors generated by C tor, and fix some bugs

Closes #865

See merge request tpo/core/arti!1189
parents c869d7bb d008c385
Branches master
No related tags found
No related merge requests found
......@@ -4489,6 +4489,7 @@ dependencies = [
"tor-checkable",
"tor-config",
"tor-error",
"tor-hscrypto",
"tor-linkspec",
"tor-llcrypto",
"tor-protover",
......
......@@ -36,7 +36,7 @@ experimental = ["experimental-api", "hs-client", "hs-service", "ntor_v3", "testi
ntor_v3 = ["__is_experimental"]
hs-client = ["hs-common", "__is_experimental"]
hs-service = ["hs-common", "__is_experimental"]
hs-common = []
hs-common = ["tor-hscrypto"]
experimental-api = ["send-control-msg", "__is_experimental"]
send-control-msg = ["visibility"] # send_control_message etc.; TODO HS should this be in hs-client?
# Enable testing-only APIs. APIs under this feature are not
......@@ -75,6 +75,7 @@ tor-cert = { path = "../tor-cert", version = "0.7.0" }
tor-checkable = { path = "../tor-checkable", version = "0.5.0" }
tor-config = { path = "../tor-config", version = "0.9.0" }
tor-error = { path = "../tor-error", version = "0.5.0" }
tor-hscrypto = { path = "../tor-hscrypto", version = "0.2.0", optional = true }
tor-linkspec = { path = "../tor-linkspec", version = "0.7.0" }
tor-llcrypto = { path = "../tor-llcrypto", version = "0.5.0" }
tor-protover = { path = "../tor-protover", version = "0.5.0" }
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment