December 2016 - tor-commits - lists.torproject.org

[tor/master] crypto_digest512 returns expected error value of -1
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit e01b09d5cecac33fa8633a18982560e34a67ee88 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Thu Nov 17 23:02:39 2016 -0500 crypto_digest512 returns expected error value of -1 --- src/common/crypto.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index c075423..2571829 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1737,7 +1737,7 @@ crypto_digest256(char *digest, const char *m, size_t len, /** Compute a 512-bit digest of len bytes in data stored in m, * using the algorithm algorithm. Write the DIGEST_LEN512-byte result - * into digest. Return 0 on success, 1 on failure. */ + * into digest. Return 0 on success, -1 on failure. */ int crypto_digest512(char *digest, const char *m, size_t len, digest_algorithm_t algorithm) @@ -1745,12 +1745,18 @@ crypto_digest512(char *digest, const char *m, size_t len, tor_assert(m); tor_assert(digest); tor_assert(algorithm == DIGEST_SHA512 || algorithm == DIGEST_SHA3_512); + + int ret = 0; if (algorithm == DIGEST_SHA512) - return (SHA512((const unsigned char*)m,len,(unsigned char*)digest) - == NULL); + ret = (SHA512((const unsigned char*)m,len,(unsigned char*)digest) + != NULL); else - return (sha3_512((uint8_t*)digest, DIGEST512_LEN, (const uint8_t*)m, len) - == -1); + ret = (sha3_512((uint8_t*)digest, DIGEST512_LEN, (const uint8_t*)m, len) + > -1); + + if (!ret) + return -1; + return 0; } /** Set the common_digests_t in ds_out to contain every digest on the

1 0

[tor/master] crypto_digest returns expected error value of -1
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 276d07a88a3b595aff9e28c7f1862563d2751b55 Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Thu Nov 17 22:45:24 2016 -0500 crypto_digest returns expected error value of -1 --- src/common/crypto.c | 10 ++++++---- src/or/rendservice.c | 2 +- src/or/routerparse.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index fff516c..f59b674 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1506,7 +1506,7 @@ crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out) if (crypto_pk_get_digest(pk, digest)) { return -1; } - if (crypto_digest(hashed_digest, digest, DIGEST_LEN)) { + if (crypto_digest(hashed_digest, digest, DIGEST_LEN) < 0) { return -1; } base16_encode(fp_out, FINGERPRINT_LEN + 1, hashed_digest, DIGEST_LEN); @@ -1700,14 +1700,16 @@ crypto_cipher_decrypt_with_iv(const char *key, /** Compute the SHA1 digest of the len bytes on data stored in * m. Write the DIGEST_LEN byte result into digest. - * Return 0 on success, 1 on failure. + * Return 0 on success, -1 on failure. */ int crypto_digest(char *digest, const char *m, size_t len) { tor_assert(m); tor_assert(digest); - return (SHA1((const unsigned char*)m,len,(unsigned char*)digest) == NULL); + if(SHA1((const unsigned char*)m,len,(unsigned char*)digest) == NULL) + return -1; + return 0; } /** Compute a 256-bit digest of len bytes in data stored in m, @@ -2628,7 +2630,7 @@ crypto_expand_key_material_TAP(const uint8_t *key_in, size_t key_in_len, for (cp = key_out, i=0; cp < key_out+key_out_len; ++i, cp += DIGEST_LEN) { tmp[key_in_len] = i; - if (crypto_digest((char*)digest, (const char *)tmp, key_in_len+1)) + if (crypto_digest((char*)digest, (const char *)tmp, key_in_len+1) < 0) goto exit; memcpy(cp, digest, MIN(DIGEST_LEN, key_out_len-(cp-key_out))); } diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 8ffd0bc..4d25251 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3084,7 +3084,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) len += 2; memcpy(auth, circuit->cpath->prev->rend_circ_nonce, DIGEST_LEN); memcpy(auth+DIGEST_LEN, "INTRODUCE", 9); - if (crypto_digest(buf+len, auth, DIGEST_LEN+9)) + if (crypto_digest(buf+len, auth, DIGEST_LEN+9) < 0) goto err; len += 20; note_crypto_pk_op(REND_SERVER); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2cfd3fc..8f8d2b8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4536,7 +4536,7 @@ router_get_hash_impl(const char *s, size_t s_len, char *digest, return -1; if (alg == DIGEST_SHA1) { - if (crypto_digest(digest, start, end-start)) { + if (crypto_digest(digest, start, end-start) < 0) { log_warn(LD_BUG,"couldn't compute digest"); return -1; }

1 0

[tor/master] crypto_digest256 returns expected error value of -1
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 9d9110f65db8af5ea4ddf93b01a099eb53e9b59f Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Thu Nov 17 22:58:36 2016 -0500 crypto_digest256 returns expected error value of -1 --- src/common/crypto.c | 14 ++++++++++---- src/or/routerparse.c | 2 +- src/or/shared_random.c | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index f59b674..c075423 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1714,7 +1714,7 @@ crypto_digest(char *digest, const char *m, size_t len) /** Compute a 256-bit digest of len bytes in data stored in m, * using the algorithm algorithm. Write the DIGEST_LEN256-byte result - * into digest. Return 0 on success, 1 on failure. */ + * into digest. Return 0 on success, -1 on failure. */ int crypto_digest256(char *digest, const char *m, size_t len, digest_algorithm_t algorithm) @@ -1722,11 +1722,17 @@ crypto_digest256(char *digest, const char *m, size_t len, tor_assert(m); tor_assert(digest); tor_assert(algorithm == DIGEST_SHA256 || algorithm == DIGEST_SHA3_256); + + int ret = 0; if (algorithm == DIGEST_SHA256) - return (SHA256((const uint8_t*)m,len,(uint8_t*)digest) == NULL); + ret = (SHA256((const uint8_t*)m,len,(uint8_t*)digest) != NULL); else - return (sha3_256((uint8_t *)digest, DIGEST256_LEN,(const uint8_t *)m, len) - == -1); + ret = (sha3_256((uint8_t *)digest, DIGEST256_LEN,(const uint8_t *)m, len) + > -1); + + if (!ret) + return -1; + return 0; } /** Compute a 512-bit digest of len bytes in data stored in m, diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 8f8d2b8..f3246c9 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4541,7 +4541,7 @@ router_get_hash_impl(const char *s, size_t s_len, char *digest, return -1; } } else { - if (crypto_digest256(digest, start, end-start, alg)) { + if (crypto_digest256(digest, start, end-start, alg) < 0) { log_warn(LD_BUG,"couldn't compute digest"); return -1; } diff --git a/src/or/shared_random.c b/src/or/shared_random.c index 5f6b03f..0eb9338 100644 --- a/src/or/shared_random.c +++ b/src/or/shared_random.c @@ -192,7 +192,7 @@ verify_commit_and_reveal(const sr_commit_t *commit) /* Use the invariant length since the encoded reveal variable has an * extra byte for the NUL terminated byte. */ if (crypto_digest256(received_hashed_reveal, commit->encoded_reveal, - SR_REVEAL_BASE64_LEN, commit->alg)) { + SR_REVEAL_BASE64_LEN, commit->alg) < 0) { /* Unable to digest the reveal blob, this is unlikely. */ goto invalid; } @@ -932,7 +932,7 @@ sr_generate_our_commit(time_t timestamp, const authority_cert_t *my_rsa_cert) /* The invariant length is used here since the encoded reveal variable * has an extra byte added for the NULL terminated byte. */ if (crypto_digest256(commit->hashed_reveal, commit->encoded_reveal, - SR_REVEAL_BASE64_LEN, commit->alg)) { + SR_REVEAL_BASE64_LEN, commit->alg) < 0) { goto error; } @@ -1012,7 +1012,7 @@ sr_compute_srv(void) SMARTLIST_FOREACH(chunks, char *, s, tor_free(s)); smartlist_free(chunks); if (crypto_digest256(hashed_reveals, reveals, strlen(reveals), - SR_DIGEST_ALG)) { + SR_DIGEST_ALG) < 0) { goto end; } current_srv = generate_srv(hashed_reveals, reveal_num,

1 0

[tor/master] adds changes file
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 1ca777474b858acfa97137c155488a78006d494b Author: Chelsea H. Komlo <chelsea.komlo(a)gmail.com> Date: Sun Nov 20 20:00:24 2016 -0500 adds changes file --- changes/ticket20717 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket20717 b/changes/ticket20717 new file mode 100644 index 0000000..c896f8a --- /dev/null +++ b/changes/ticket20717 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Refactors the hashing API to return negative values for errors as is done + as a standard throughout the codebase. + - Refactors calling functions to expect negative values for errors.

1 0

[tor/master] Merge remote-tracking branch 'chelseakomlo/20717_hashing_api_bug'
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit f92630941ab8f6d79d23acc921eb780202b65e3b Merge: 3f295bb 1ca7774 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 10:27:16 2016 -0500 Merge remote-tracking branch 'chelseakomlo/20717_hashing_api_bug' changes/ticket20717 | 4 ++++ src/common/crypto.c | 40 +++++++++++++++++++++++++++------------- src/or/rendservice.c | 2 +- src/or/routerparse.c | 4 ++-- src/or/shared_random.c | 6 +++--- 5 files changed, 37 insertions(+), 19 deletions(-)

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit daeb633825920ca99830c75a79d9a7d4ed211a13 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 10:31:10 2016 -0500 whitespace fix --- src/common/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2571829..be42d36 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1707,7 +1707,7 @@ crypto_digest(char *digest, const char *m, size_t len) { tor_assert(m); tor_assert(digest); - if(SHA1((const unsigned char*)m,len,(unsigned char*)digest) == NULL) + if (SHA1((const unsigned char*)m,len,(unsigned char*)digest) == NULL) return -1; return 0; }

1 0

[tor/master] Fix a couple more crypto_digest() calls to be explicit < 0
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 41adfd6fa38bf94bc7d71174dbaf7f32a41a64ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 10:31:31 2016 -0500 Fix a couple more crypto_digest() calls to be explicit < 0 --- src/or/routerparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f3246c9..38ceb94 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -715,7 +715,7 @@ dump_desc_populate_one_file, (const char *dirname, const char *f)) * filename. */ if (crypto_digest256((char *)content_digest, desc, (size_t) st.st_size, - DIGEST_SHA256) != 0) { + DIGEST_SHA256) < 0) { /* Weird, but okay */ log_info(LD_DIR, "Unable to hash content of %s from unparseable descriptors " @@ -879,7 +879,7 @@ dump_desc(const char *desc, const char *type) /* Get the hash for logging purposes anyway */ len = strlen(desc); if (crypto_digest256((char *)digest_sha256, desc, len, - DIGEST_SHA256) != 0) { + DIGEST_SHA256) < 0) { log_info(LD_DIR, "Unable to parse descriptor of type %s, and unable to even hash" " it!", type);

1 0

[tor/maint-0.2.8] 20865: Don't use getentropy() on OSX Sierra.
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 714aeedc5278fe50fb2b9ccafeefa4270eaf3391 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 09:37:03 2016 -0500 20865: Don't use getentropy() on OSX Sierra. Tor 0.2.9 has a broader range of fixes and workarounds here, but for 0.2.8, we're just going to maintain the existing behavior. (The alternative would be to backport both 1eba088054eca1555b455ee4a2adfafecb888af9 and 16fcbd21c963a9a65bf55024680c8323c8b7175d , but the latter is kind of a subtle kludge in the configure.ac script, and I'm not a fan of backporting that kind of thing.) --- changes/bug20865 | 7 +++++++ src/common/crypto.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/changes/bug20865 b/changes/bug20865 new file mode 100644 index 0000000..575d886 --- /dev/null +++ b/changes/bug20865 @@ -0,0 +1,7 @@ + o Minor bugfixes (portability): + - Avoid compilation errors when building on OSX Sierra. Sierra began + to support the getentropy() API, but created a few problems in + doing so. Tor 0.2.9 has a more thorough set of workarounds; in + 0.2.8, we are just using the /dev/urandom interface. Fixes + bug 20865. Bugfix on 0.2.8.1-alpha. + diff --git a/src/common/crypto.c b/src/common/crypto.c index c5d07df..f7bb8ff 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -88,6 +88,15 @@ #include "keccak-tiny/keccak-tiny.h" +#ifdef __APPLE__ +/* Apple messed up their getentropy definitions in Sierra. It's not insecure + * or anything (as far as I know) but it makes compatible builds hard. 0.2.9 + * contains the necessary tricks to do it right: in 0.2.8, we're just using + * this blunt instrument. + */ +#undef HAVE_GETENTROPY +#endif + #ifdef ANDROID /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES

1 0

[tor/release-0.2.8] 20865: Don't use getentropy() on OSX Sierra.
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit 714aeedc5278fe50fb2b9ccafeefa4270eaf3391 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 09:37:03 2016 -0500 20865: Don't use getentropy() on OSX Sierra. Tor 0.2.9 has a broader range of fixes and workarounds here, but for 0.2.8, we're just going to maintain the existing behavior. (The alternative would be to backport both 1eba088054eca1555b455ee4a2adfafecb888af9 and 16fcbd21c963a9a65bf55024680c8323c8b7175d , but the latter is kind of a subtle kludge in the configure.ac script, and I'm not a fan of backporting that kind of thing.) --- changes/bug20865 | 7 +++++++ src/common/crypto.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/changes/bug20865 b/changes/bug20865 new file mode 100644 index 0000000..575d886 --- /dev/null +++ b/changes/bug20865 @@ -0,0 +1,7 @@ + o Minor bugfixes (portability): + - Avoid compilation errors when building on OSX Sierra. Sierra began + to support the getentropy() API, but created a few problems in + doing so. Tor 0.2.9 has a more thorough set of workarounds; in + 0.2.8, we are just using the /dev/urandom interface. Fixes + bug 20865. Bugfix on 0.2.8.1-alpha. + diff --git a/src/common/crypto.c b/src/common/crypto.c index c5d07df..f7bb8ff 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -88,6 +88,15 @@ #include "keccak-tiny/keccak-tiny.h" +#ifdef __APPLE__ +/* Apple messed up their getentropy definitions in Sierra. It's not insecure + * or anything (as far as I know) but it makes compatible builds hard. 0.2.9 + * contains the necessary tricks to do it right: in 0.2.8, we're just using + * this blunt instrument. + */ +#undef HAVE_GETENTROPY +#endif + #ifdef ANDROID /* Android's OpenSSL seems to have removed all of its Engine support. */ #define DISABLE_ENGINES

1 0

[tor/release-0.2.8] Merge branch 'getentropy_028' into maint-0.2.8
by nickm＠torproject.org 05 Dec '16

05 Dec '16

commit cc34ba1cecc7733bf69a6fee9e6ecf2ac8661b7e Merge: 2a36541 714aeed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 5 10:06:16 2016 -0500 Merge branch 'getentropy_028' into maint-0.2.8 changes/bug20865 | 7 +++++++ src/common/crypto.c | 9 +++++++++ 2 files changed, 16 insertions(+)

1 0