summaryrefslogtreecommitdiff
path: root/src/trunnel/hs/cell_introduce1.trunnel
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-05-15 15:30:29 -0400
committerNick Mathewson <nickm@torproject.org>2019-05-20 08:56:34 -0400
commit56908c6f1c63d32bef7011c811976e24156f17d3 (patch)
tree23fa9f6e906177d93e79ba16b144f3500f4e9729 /src/trunnel/hs/cell_introduce1.trunnel
parent7d3e904a27ac714c33f9b1e14b4d1d18d4042147 (diff)
downloadtor-56908c6f1c63d32bef7011c811976e24156f17d3.tar.gz
tor-56908c6f1c63d32bef7011c811976e24156f17d3.zip
hs: Remove hs_cell_onion_key_type_t enum
Unify this with the trunnel ABI so we don't duplicate. Part of #30454 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/trunnel/hs/cell_introduce1.trunnel')
-rw-r--r--src/trunnel/hs/cell_introduce1.trunnel5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/trunnel/hs/cell_introduce1.trunnel b/src/trunnel/hs/cell_introduce1.trunnel
index bbb091d2b8..5911c695a2 100644
--- a/src/trunnel/hs/cell_introduce1.trunnel
+++ b/src/trunnel/hs/cell_introduce1.trunnel
@@ -22,6 +22,9 @@ const TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY0 = 0x00;
const TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY1 = 0x01;
const TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519 = 0x02;
+/* Onion key type. */
+const TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR = 0x01;
+
/* INTRODUCE1 payload. See details in section 3.2.1. */
struct trn_cell_introduce1 {
/* Always zeroed. MUST be checked explicitly by the caller. */
@@ -59,7 +62,7 @@ struct trn_cell_introduce_encrypted {
struct trn_cell_extension extensions;
/* Onion key material. */
- u8 onion_key_type IN [0x01];
+ u8 onion_key_type IN [TRUNNEL_HS_INTRO_ONION_KEY_TYPE_NTOR];
u16 onion_key_len;
u8 onion_key[onion_key_len];