mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

hs: Remove redundant define of ed25519 auth key type

Browse source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2016-12-22 16:59:18 -05:00
parent 419c0c0788
commit c716702625
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/or/hs_common.h
View file

@ -17,9 +17,6 @@
/* Version 3 of the protocol (prop224). */ /* Version 3 of the protocol (prop224). */
#define HS_VERSION_THREE 3 #define HS_VERSION_THREE 3
/* Denotes ed25519 authentication key on ESTABLISH_INTRO cell. */
#define AUTH_KEY_ED25519 0x02
/* String prefix for the signature of ESTABLISH_INTRO */ /* String prefix for the signature of ESTABLISH_INTRO */
#define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1" #define ESTABLISH_INTRO_SIG_PREFIX "Tor establish-intro cell v1"

4
src/or/hs_intropoint.c
View file

@ -73,9 +73,9 @@ verify_establish_intro_cell(const hs_cell_establish_intro_t *cell,
size_t circuit_key_material_len) size_t circuit_key_material_len)
{ {
/* We only reach this function if the first byte of the cell is 0x02 which /* We only reach this function if the first byte of the cell is 0x02 which
* means that auth_key_type is AUTH_KEY_ED25519, hence this check should * means that auth_key_type is of ed25519 type, hence this check should
* always pass. See hs_intro_received_establish_intro(). */ * always pass. See hs_intro_received_establish_intro(). */
if (BUG(cell->auth_key_type != AUTH_KEY_ED25519)) { if (BUG(cell->auth_key_type != HS_INTRO_AUTH_KEY_TYPE_ED25519)) {
return -1; return -1;
} }

4
src/or/hs_service.c
View file

@ -12,6 +12,7 @@
#include "circuitlist.h" #include "circuitlist.h"
#include "circpathbias.h" #include "circpathbias.h"
#include "hs_intropoint.h"
#include "hs_service.h" #include "hs_service.h"
#include "hs_common.h" #include "hs_common.h"
@ -75,7 +76,8 @@ generate_establish_intro_cell(const uint8_t *circuit_key_material,
cell = hs_cell_establish_intro_new(); cell = hs_cell_establish_intro_new();
/* Set AUTH_KEY_TYPE: 2 means ed25519 */ /* Set AUTH_KEY_TYPE: 2 means ed25519 */
hs_cell_establish_intro_set_auth_key_type(cell, AUTH_KEY_ED25519); hs_cell_establish_intro_set_auth_key_type(cell,
HS_INTRO_AUTH_KEY_TYPE_ED25519);
/* Set AUTH_KEY_LEN field */ /* Set AUTH_KEY_LEN field */
/* Must also set byte-length of AUTH_KEY to match */ /* Must also set byte-length of AUTH_KEY to match */