Commit 29721382 authored by George Kadianakis's avatar George Kadianakis Committed by Nick Mathewson
Browse files

prop224: Add unittests handling v3 ESTABLISH_INTRO cells. 

Test for both v2 and v3 ESTABLISH_INTRO handling.
parent 12dfe56b

src/common/crypto_ed25519.c

+5 −5
Original line number Diff line number Diff line
@@ -267,11 +267,11 @@ ed25519_sign(ed25519_signature_t *signature_out, 
 * Like ed25519_sign(), but also prefix <b>msg</b> with <b>prefix_str</b>

 * before signing. <b>prefix_str</b> must be a NUL-terminated string.

 */

int

ed25519_sign_prefixed(ed25519_signature_t *signature_out,

MOCK_IMPL(int,

ed25519_sign_prefixed,(ed25519_signature_t *signature_out,

                       const uint8_t *msg, size_t msg_len,

                       const char *prefix_str,

                      const ed25519_keypair_t *keypair)

                       const ed25519_keypair_t *keypair))

{

  int retval;

  size_t prefixed_msg_len;

src/common/crypto_ed25519.h

+6 −5
Original line number Diff line number Diff line
@@ -55,11 +55,12 @@ int ed25519_checksig(const ed25519_signature_t *signature, 
                     const uint8_t *msg, size_t len,

                     const ed25519_public_key_t *pubkey);



int

ed25519_sign_prefixed(ed25519_signature_t *signature_out,

MOCK_DECL(int,

ed25519_sign_prefixed,(ed25519_signature_t *signature_out,

                       const uint8_t *msg, size_t len,

                       const char *prefix_str,

                      const ed25519_keypair_t *keypair);

                       const ed25519_keypair_t *keypair));



int

ed25519_checksig_prefixed(const ed25519_signature_t *signature,

                          const uint8_t *msg, size_t len,

src/test/include.am

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ src_test_test_SOURCES = \ 
	src/test/test_guardfraction.c \

	src/test/test_extorport.c \

	src/test/test_hs.c \

	src/test/test_hs_service.c \

	src/test/test_hs_intropoint.c \

	src/test/test_handles.c \

	src/test/test_hs_cache.c \

	src/test/test_hs_descriptor.c \

src/test/test.c

+3 −1
Original line number Diff line number Diff line
@@ -1204,9 +1204,11 @@ struct testgroup_t testgroups[] = { 
  { "entrynodes/", entrynodes_tests },

  { "guardfraction/", guardfraction_tests },

  { "extorport/", extorport_tests },

  { "hs/", hs_tests },

  { "legacy_hs/", hs_tests },

  { "hs_cache/", hs_cache },

  { "hs_descriptor/", hs_descriptor },

  { "hs_service/", hs_service_tests },

  { "hs_intropoint/", hs_intropoint_tests },

  { "introduce/", introduce_tests },

  { "keypin/", keypin_tests },

  { "link-handshake/", link_handshake_tests },

src/test/test.h

+2 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ extern struct testcase_t extorport_tests[]; 
extern struct testcase_t hs_tests[];

extern struct testcase_t hs_cache[];

extern struct testcase_t hs_descriptor[];

extern struct testcase_t hs_service_tests[];

extern struct testcase_t hs_intropoint_tests[];

extern struct testcase_t introduce_tests[];

extern struct testcase_t keypin_tests[];

extern struct testcase_t link_handshake_tests[];