nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compilation warnings in {test_,}hs_descriptor.c

Browse Source 
Nothing big: just some const char[]s that should have been static,
and some integer truncation warnings.

Warnings not in any released Tor.
This commit is contained in:
Nick Mathewson 2017-03-13 22:36:47 -04:00
parent dc37ea8b98
commit 236e1f31d9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/hs_descriptor.c
View File

@ -1505,8 +1505,9 @@ decode_superencrypted(const char *message, size_t message_len,
/* Copy the encrypted blob to the descriptor object so we can handle it /* Copy the encrypted blob to the descriptor object so we can handle it
* latter if needed. */ * latter if needed. */
tor_assert(tok->object_size <= INT_MAX);
*encrypted_out = tor_memdup(tok->object_body, tok->object_size); *encrypted_out = tor_memdup(tok->object_body, tok->object_size);
retval = tok->object_size; retval = (int) tok->object_size;
} }
err: err:

20
src/test/test_hs_descriptor.c
View File

@ -1005,7 +1005,7 @@ test_desc_signature(void *arg)
} }
/* bad desc auth type */ /* bad desc auth type */
const char bad_superencrypted_text1[] = "desc-auth-type scoobysnack\n" static const char bad_superencrypted_text1[] = "desc-auth-type scoobysnack\n"
"desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n" "desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n"
"auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n"
"encrypted\n" "encrypted\n"
@ -1015,7 +1015,7 @@ const char bad_superencrypted_text1[] = "desc-auth-type scoobysnack\n"
"-----END MESSAGE-----\n"; "-----END MESSAGE-----\n";
/* bad ephemeral key */ /* bad ephemeral key */
const char bad_superencrypted_text2[] = "desc-auth-type x25519\n" static const char bad_superencrypted_text2[] = "desc-auth-type x25519\n"
"desc-auth-ephemeral-key differentalphabet\n" "desc-auth-ephemeral-key differentalphabet\n"
"auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n"
"encrypted\n" "encrypted\n"
@ -1025,7 +1025,7 @@ const char bad_superencrypted_text2[] = "desc-auth-type x25519\n"
"-----END MESSAGE-----\n"; "-----END MESSAGE-----\n";
/* bad encrypted msg */ /* bad encrypted msg */
const char bad_superencrypted_text3[] = "desc-auth-type x25519\n" static const char bad_superencrypted_text3[] = "desc-auth-type x25519\n"
"desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n" "desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n"
"auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n"
"encrypted\n" "encrypted\n"
@ -1033,7 +1033,7 @@ const char bad_superencrypted_text3[] = "desc-auth-type x25519\n"
"SO SMALL NOT GOOD\n" "SO SMALL NOT GOOD\n"
"-----END MESSAGE-----\n"; "-----END MESSAGE-----\n";
const char correct_superencrypted_text[] = "desc-auth-type x25519\n" static const char correct_superencrypted_text[] = "desc-auth-type x25519\n"
"desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n" "desc-auth-ephemeral-key A/O8DVtnUheb3r1JqoB8uJB7wxXL1XJX3eny4yB+eFA=\n"
"auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n" "auth-client oiNrQB8WwKo S5D02W7vKgiWIMygrBl8RQ FB//SfOBmLEx1kViEWWL1g\n"
"auth-client Od09Qu636Qo /PKLzqewAdS/+0+vZC+MvQ dpw4NFo13zDnuPz45rxrOg\n" "auth-client Od09Qu636Qo /PKLzqewAdS/+0+vZC+MvQ dpw4NFo13zDnuPz45rxrOg\n"
@ -1044,14 +1044,14 @@ const char correct_superencrypted_text[] = "desc-auth-type x25519\n"
"BiYWQgYXQgYWxs\n" "BiYWQgYXQgYWxs\n"
"-----END MESSAGE-----\n"; "-----END MESSAGE-----\n";
const char correct_encrypted_plaintext[] = "being on mountains, " static const char correct_encrypted_plaintext[] = "being on mountains, "
"thinking about computers, is not bad at all"; "thinking about computers, is not bad at all";
static void static void
test_parse_hs_desc_superencrypted(void *arg) test_parse_hs_desc_superencrypted(void *arg)
{ {
(void) arg; (void) arg;
int retval; size_t retval;
uint8_t *encrypted_out = NULL; uint8_t *encrypted_out = NULL;
{ {
@ -1059,7 +1059,7 @@ test_parse_hs_desc_superencrypted(void *arg)
retval = decode_superencrypted(bad_superencrypted_text1, retval = decode_superencrypted(bad_superencrypted_text1,
strlen(bad_superencrypted_text1), strlen(bad_superencrypted_text1),
&encrypted_out); &encrypted_out);
tt_int_op(retval, ==, 0); tt_u64_op(retval, ==, 0);
tt_assert(!encrypted_out); tt_assert(!encrypted_out);
expect_log_msg_containing("Unrecognized desc auth type"); expect_log_msg_containing("Unrecognized desc auth type");
teardown_capture_of_logs(); teardown_capture_of_logs();
@ -1070,7 +1070,7 @@ test_parse_hs_desc_superencrypted(void *arg)
retval = decode_superencrypted(bad_superencrypted_text2, retval = decode_superencrypted(bad_superencrypted_text2,
strlen(bad_superencrypted_text2), strlen(bad_superencrypted_text2),
&encrypted_out); &encrypted_out);
tt_int_op(retval, ==, 0); tt_u64_op(retval, ==, 0);
tt_assert(!encrypted_out); tt_assert(!encrypted_out);
expect_log_msg_containing("Bogus desc auth key in HS desc"); expect_log_msg_containing("Bogus desc auth key in HS desc");
teardown_capture_of_logs(); teardown_capture_of_logs();
@ -1081,7 +1081,7 @@ test_parse_hs_desc_superencrypted(void *arg)
retval = decode_superencrypted(bad_superencrypted_text3, retval = decode_superencrypted(bad_superencrypted_text3,
strlen(bad_superencrypted_text3), strlen(bad_superencrypted_text3),
&encrypted_out); &encrypted_out);
tt_int_op(retval, ==, 0); tt_u64_op(retval, ==, 0);
tt_assert(!encrypted_out); tt_assert(!encrypted_out);
expect_log_msg_containing("Length of descriptor\'s encrypted data " expect_log_msg_containing("Length of descriptor\'s encrypted data "
"is too small."); "is too small.");
@ -1093,7 +1093,7 @@ test_parse_hs_desc_superencrypted(void *arg)
strlen(correct_superencrypted_text), strlen(correct_superencrypted_text),
&encrypted_out); &encrypted_out);
tt_int_op(retval, ==, strlen(correct_encrypted_plaintext)); tt_u64_op(retval, ==, strlen(correct_encrypted_plaintext));
tt_mem_op(encrypted_out, OP_EQ, correct_encrypted_plaintext, tt_mem_op(encrypted_out, OP_EQ, correct_encrypted_plaintext,
strlen(correct_encrypted_plaintext)); strlen(correct_encrypted_plaintext));