October 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.2] double newline
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c3ea1ccf04cd0aaa8c33d78c0abd46db68a1346b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 14:18:48 2017 -0400 double newline --- src/or/hs_descriptor.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 7730ce09f..52bec8e24 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -267,7 +267,6 @@ MOCK_DECL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc, int is_superencrypted_layer, char **decrypted_out)); - #endif /* defined(HS_DESCRIPTOR_PRIVATE) */ #endif /* !defined(TOR_HS_DESCRIPTOR_H) */

1 0

[tor/master] double newline
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c3ea1ccf04cd0aaa8c33d78c0abd46db68a1346b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 14:18:48 2017 -0400 double newline --- src/or/hs_descriptor.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 7730ce09f..52bec8e24 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -267,7 +267,6 @@ MOCK_DECL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc, int is_superencrypted_layer, char **decrypted_out)); - #endif /* defined(HS_DESCRIPTOR_PRIVATE) */ #endif /* !defined(TOR_HS_DESCRIPTOR_H) */

1 0

[tor/maint-0.3.2] double newline
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c3ea1ccf04cd0aaa8c33d78c0abd46db68a1346b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 14:18:48 2017 -0400 double newline --- src/or/hs_descriptor.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 7730ce09f..52bec8e24 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -267,7 +267,6 @@ MOCK_DECL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc, int is_superencrypted_layer, char **decrypted_out)); - #endif /* defined(HS_DESCRIPTOR_PRIVATE) */ #endif /* !defined(TOR_HS_DESCRIPTOR_H) */

1 0

[nyx/master] Fix syntax error
by atagar＠torproject.org 31 Oct '17

31 Oct '17

commit babfabc771ad80d1ab001e789483ee2e9eaea1ed Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 31 11:06:53 2017 -0700 Fix syntax error --- nyx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index f91ef07..5a8de5d 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -75,7 +75,7 @@ SQLITE_UNAVAILABLE_FREEBSD = """\ Python's sqlite3 module is unavailable. Please run... sudo pkg install py%i%i-sqlite3 -""" % (sys.version_info[:2] +""" % (sys.version_info[:2]) try: import sqlite3

1 0

[tor/maint-0.3.2] In the hsdescv3 fuzzer, replace the decryption function.
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 26e0909e516a91281c2ad1fcac23405f3cc1ee11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 14:28:02 2017 -0400 In the hsdescv3 fuzzer, replace the decryption function. The new decryption function performs no decryption, skips the salt, and doesn't check the mac. This allows us to fuzz the hs_descriptor.c code using unencrypted descriptor test, and exercise more of the code. Related to 21509. --- changes/hsdescv3_fuzz_more | 3 +++ src/or/hs_descriptor.c | 12 ++++++------ src/or/hs_descriptor.h | 7 +++++++ src/test/fuzz/fuzz_hsdescv3.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/changes/hsdescv3_fuzz_more b/changes/hsdescv3_fuzz_more new file mode 100644 index 000000000..25626bb9a --- /dev/null +++ b/changes/hsdescv3_fuzz_more @@ -0,0 +1,3 @@ + o Minor features (testing): + - Our fuzzing tests now test the encrypted portions of the + v3 hidden service descriptors. Implements more of 21509. diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 4bc54bdb2..a8ff3471c 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1303,12 +1303,12 @@ encrypted_data_length_is_valid(size_t len) * generate the right decryption keys; set decrypted_out to the * plaintext. If is_superencrypted_layer is set, this is the outter * encrypted layer of the descriptor. */ -static size_t -decrypt_desc_layer(const hs_descriptor_t *desc, - const uint8_t *encrypted_blob, - size_t encrypted_blob_size, - int is_superencrypted_layer, - char **decrypted_out) +MOCK_IMPL(STATIC size_t, +decrypt_desc_layer,(const hs_descriptor_t *desc, + const uint8_t *encrypted_blob, + size_t encrypted_blob_size, + int is_superencrypted_layer, + char **decrypted_out)) { uint8_t *decrypted = NULL; uint8_t secret_key[HS_DESC_ENCRYPTED_KEY_LEN], secret_iv[CIPHER_IV_LEN]; diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 971e85664..7730ce09f 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -261,6 +261,13 @@ STATIC size_t decode_superencrypted(const char *message, size_t message_len, uint8_t **encrypted_out); STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc); +MOCK_DECL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc, + const uint8_t *encrypted_blob, + size_t encrypted_blob_size, + int is_superencrypted_layer, + char **decrypted_out)); + + #endif /* defined(HS_DESCRIPTOR_PRIVATE) */ #endif /* !defined(TOR_HS_DESCRIPTOR_H) */ diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 03c509e2e..30e82c925 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -35,12 +35,31 @@ mock_rsa_ed25519_crosscert_check(const uint8_t *crosscert, return 0; } +static size_t +mock_decrypt_desc_layer(const hs_descriptor_t *desc, + const uint8_t *encrypted_blob, + size_t encrypted_blob_size, + int is_superencrypted_layer, + char **decrypted_out) +{ + (void)is_superencrypted_layer; + (void)desc; + const size_t overhead = HS_DESC_ENCRYPTED_SALT_LEN + DIGEST256_LEN; + if (encrypted_blob_size < overhead) + return 0; + *decrypted_out = tor_memdup_nulterm( + encrypted_blob + HS_DESC_ENCRYPTED_SALT_LEN, + encrypted_blob_size - overhead); + return strlen(*decrypted_out); +} + int fuzz_init(void) { disable_signature_checking(); MOCK(dump_desc, mock_dump_desc__nodump); MOCK(rsa_ed25519_crosscert_check, mock_rsa_ed25519_crosscert_check); + MOCK(decrypt_desc_layer, mock_decrypt_desc_layer); ed25519_init(); return 0; }

1 0

[tor/master] Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 8dffc46748d758d94369421b13c9e23c1affc6ab Merge: 652d22e60 26e0909e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 14:04:31 2017 -0400 Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2 changes/hsdescv3_fuzz_more | 3 +++ src/or/hs_descriptor.c | 12 ++++++------ src/or/hs_descriptor.h | 7 +++++++ src/test/fuzz/fuzz_hsdescv3.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 2b6f24665215808ed5c3e366371eaf65f917df8d Merge: b76a161e0 8dffc4674 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 14:04:34 2017 -0400 Merge branch 'maint-0.3.2' changes/hsdescv3_fuzz_more | 3 +++ src/or/hs_descriptor.c | 12 ++++++------ src/or/hs_descriptor.h | 7 +++++++ src/test/fuzz/fuzz_hsdescv3.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 8dffc46748d758d94369421b13c9e23c1affc6ab Merge: 652d22e60 26e0909e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 14:04:31 2017 -0400 Merge branch 'hsdescv3_fuzz_more' into maint-0.3.2 changes/hsdescv3_fuzz_more | 3 +++ src/or/hs_descriptor.c | 12 ++++++------ src/or/hs_descriptor.h | 7 +++++++ src/test/fuzz/fuzz_hsdescv3.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-)

1 0

[tor/master] In the hsdescv3 fuzzer, replace the decryption function.
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 26e0909e516a91281c2ad1fcac23405f3cc1ee11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 14:28:02 2017 -0400 In the hsdescv3 fuzzer, replace the decryption function. The new decryption function performs no decryption, skips the salt, and doesn't check the mac. This allows us to fuzz the hs_descriptor.c code using unencrypted descriptor test, and exercise more of the code. Related to 21509. --- changes/hsdescv3_fuzz_more | 3 +++ src/or/hs_descriptor.c | 12 ++++++------ src/or/hs_descriptor.h | 7 +++++++ src/test/fuzz/fuzz_hsdescv3.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/changes/hsdescv3_fuzz_more b/changes/hsdescv3_fuzz_more new file mode 100644 index 000000000..25626bb9a --- /dev/null +++ b/changes/hsdescv3_fuzz_more @@ -0,0 +1,3 @@ + o Minor features (testing): + - Our fuzzing tests now test the encrypted portions of the + v3 hidden service descriptors. Implements more of 21509. diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 4bc54bdb2..a8ff3471c 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1303,12 +1303,12 @@ encrypted_data_length_is_valid(size_t len) * generate the right decryption keys; set decrypted_out to the * plaintext. If is_superencrypted_layer is set, this is the outter * encrypted layer of the descriptor. */ -static size_t -decrypt_desc_layer(const hs_descriptor_t *desc, - const uint8_t *encrypted_blob, - size_t encrypted_blob_size, - int is_superencrypted_layer, - char **decrypted_out) +MOCK_IMPL(STATIC size_t, +decrypt_desc_layer,(const hs_descriptor_t *desc, + const uint8_t *encrypted_blob, + size_t encrypted_blob_size, + int is_superencrypted_layer, + char **decrypted_out)) { uint8_t *decrypted = NULL; uint8_t secret_key[HS_DESC_ENCRYPTED_KEY_LEN], secret_iv[CIPHER_IV_LEN]; diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 971e85664..7730ce09f 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -261,6 +261,13 @@ STATIC size_t decode_superencrypted(const char *message, size_t message_len, uint8_t **encrypted_out); STATIC void desc_plaintext_data_free_contents(hs_desc_plaintext_data_t *desc); +MOCK_DECL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc, + const uint8_t *encrypted_blob, + size_t encrypted_blob_size, + int is_superencrypted_layer, + char **decrypted_out)); + + #endif /* defined(HS_DESCRIPTOR_PRIVATE) */ #endif /* !defined(TOR_HS_DESCRIPTOR_H) */ diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 03c509e2e..30e82c925 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -35,12 +35,31 @@ mock_rsa_ed25519_crosscert_check(const uint8_t *crosscert, return 0; } +static size_t +mock_decrypt_desc_layer(const hs_descriptor_t *desc, + const uint8_t *encrypted_blob, + size_t encrypted_blob_size, + int is_superencrypted_layer, + char **decrypted_out) +{ + (void)is_superencrypted_layer; + (void)desc; + const size_t overhead = HS_DESC_ENCRYPTED_SALT_LEN + DIGEST256_LEN; + if (encrypted_blob_size < overhead) + return 0; + *decrypted_out = tor_memdup_nulterm( + encrypted_blob + HS_DESC_ENCRYPTED_SALT_LEN, + encrypted_blob_size - overhead); + return strlen(*decrypted_out); +} + int fuzz_init(void) { disable_signature_checking(); MOCK(dump_desc, mock_dump_desc__nodump); MOCK(rsa_ed25519_crosscert_check, mock_rsa_ed25519_crosscert_check); + MOCK(decrypt_desc_layer, mock_decrypt_desc_layer); ed25519_init(); return 0; }

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c5bb554e77ffe2e77a785be5ab055f628f3c476e Merge: 68181dc26 8dffc4674 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 14:04:34 2017 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/hsdescv3_fuzz_more | 3 +++ src/or/hs_descriptor.c | 12 ++++++------ src/or/hs_descriptor.h | 7 +++++++ src/test/fuzz/fuzz_hsdescv3.c | 19 +++++++++++++++++++ 4 files changed, 35 insertions(+), 6 deletions(-)

1 0