tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

[tor/release-0.3.4] Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 9f2b887c5d251b93ee9def70871dfd71af71d995 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:48:20 2018 +0300 Enable DEBUG_SMARTLIST for entire codebase when expensive hardening is on --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 48ca5bae1..1b57361e0 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ AC_ARG_ENABLE(fragile-hardening, AS_HELP_STRING(--enable-fragile-hardening, [enable more fragile and expensive compiler hardening; makes Tor slower])) if test "x$enable_expensive_hardening" = "xyes" || test "x$enable_fragile_hardening" = "xyes"; then fragile_hardening="yes" + AC_DEFINE(DEBUG_SMARTLIST, 1, [Enable smartlist debugging]) fi dnl Linker hardening options

1 0

[tor/release-0.3.4] Add changes file
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit ce9b9cc18d9cedd9144e86dcef48c6ae99abe7d5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Jun 3 14:56:28 2018 +0300 Add changes file --- changes/bug26196 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug26196 b/changes/bug26196 new file mode 100644 index 000000000..e63f09a2d --- /dev/null +++ b/changes/bug26196 @@ -0,0 +1,7 @@ + o Minor bugfixes (testing, compilation): + - Refrain from trying to get an item from empty smartlist in + test_bridges_clear_bridge_list. Set DEBUG_SMARTLIST in unit + tests to catch improper smartlist usage. Furthermore, + enable DEBUG_SMARTLIST globally when build is configured + with fragile hardening. Fixes bug 26196; bugfix on + 0.3.4.1-alpha.

1 0

[tor/release-0.3.4] Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 38cb638c325bc2612befc8176c545b1bcae9834f Merge: ac1747e47 ce9b9cc18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 07:50:00 2018 -0400 Merge branch 'rl1987_bug26196_rebased_034' into maint-0.3.4 changes/bug26196 | 7 +++++++ configure.ac | 1 + src/test/test.h | 2 ++ src/test/test_bridges.c | 6 +----- 4 files changed, 11 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 89614962f2ac1fa333b16c708a890167e9ec1b4e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 20 09:13:28 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes our bug 26424 (disabling UNC paths) and activates Mozilla's fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1413868. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 4289b7bcc5f9..cd901374ed9f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -250,6 +250,8 @@ pref("devtools.appmanager.enabled", false); pref("devtools.debugger.chrome-debugging-host", "127.0.0.1"); // Disable mozTCPSocket for sure (bug 18863) pref("dom.mozTCPSocket.enabled", false); +// Disable using UNC paths (bug 26424 and Mozilla's bug 1413868) +pref("network.file.disable_unc_paths", true); // Security slider pref("svg.in-content.enabled", true);

1 0

[tor-browser/tor-browser-52.8.0esr-7.5-1] Bug 1448771 - Merge fix from upstream. r=ryanvm, a=RyanVM
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 12148cf644e5820182306788a3d3309baf8c2720 Author: Jonathan Kew <jkew(a)mozilla.com> Date: Mon Mar 26 20:35:48 2018 +0100 Bug 1448771 - Merge fix from upstream. r=ryanvm, a=RyanVM --HG-- extra : source : f5db47b5c6416a3cef546de1aa9089d98109f95f --- intl/hyphenation/hyphen/hyphen.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/intl/hyphenation/hyphen/hyphen.c b/intl/hyphenation/hyphen/hyphen.c index 9a132d0262f2..9f2b7112c848 100644 --- a/intl/hyphenation/hyphen/hyphen.c +++ b/intl/hyphenation/hyphen/hyphen.c @@ -438,11 +438,25 @@ for (k = 0; k < 2; k++) { } if (k == 0 || nextlevel) { - while (fgets (buf, sizeof(buf), f) != NULL) { + while (fgets(buf, sizeof(buf), f) != NULL) { + + /* discard lines that don't fit in buffer */ + if (!feof(f) && strchr(buf, '\n') == NULL) { + int c; + while ((c = fgetc(f)) != '\n' && c != EOF); + /* issue warning if not a comment */ + if (buf[0] != '%') { + fprintf(stderr, "Warning: skipping too long pattern (more than %lu chars)\n", sizeof(buf)); + } + continue; + } + if (strncmp(buf, "NEXTLEVEL", 9) == 0) { - nextlevel = 1; - break; - } else if (buf[0] != '%') hnj_hyphen_load_line(buf, dict[k], hashtab); + nextlevel = 1; + break; + } else if (buf[0] != '%') { + hnj_hyphen_load_line(buf, dict[k], hashtab); + } } } else if (k == 1) { /* default first level: hyphen and ASCII apostrophe */

1 0

[tor-browser/tor-browser-52.8.0esr-7.5-1] Bug 1448771 - Update hnjstdio to handle additional functions from stdio.h that libhyphen wants to use. r=glandium, a=RyanVM
by gk＠torproject.org 20 Jun '18

20 Jun '18

commit 20a839344bbb11759a15d38d283a9ff8862da30b Author: Jonathan Kew <jkew(a)mozilla.com> Date: Wed Mar 28 10:17:51 2018 +0100 Bug 1448771 - Update hnjstdio to handle additional functions from stdio.h that libhyphen wants to use. r=glandium, a=RyanVM --HG-- extra : source : 846bcaa210aa2264bec412c0595113964fafc972 --- intl/hyphenation/glue/hnjalloc.h | 6 +++++ intl/hyphenation/glue/hnjstdio.cpp | 50 ++++++++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/intl/hyphenation/glue/hnjalloc.h b/intl/hyphenation/glue/hnjalloc.h index fec3a4bc9009..5cee1be1b6d7 100644 --- a/intl/hyphenation/glue/hnjalloc.h +++ b/intl/hyphenation/glue/hnjalloc.h @@ -31,6 +31,8 @@ #define fopen(path,mode) hnjFopen(path,mode) #define fclose(file) hnjFclose(file) #define fgets(buf,count,file) hnjFgets(buf,count,file) +#define feof(file) hnjFeof(file) +#define fgetc(file) hnjFgetc(file) typedef struct hnjFile_ hnjFile; @@ -44,6 +46,10 @@ int hnjFclose(hnjFile* f); char* hnjFgets(char* s, int n, hnjFile* f); +int hnjFeof(hnjFile* f); + +int hnjFgetc(hnjFile* f); + #ifdef __cplusplus } #endif diff --git a/intl/hyphenation/glue/hnjstdio.cpp b/intl/hyphenation/glue/hnjstdio.cpp index 660ebaf13291..8d50ae17f57b 100644 --- a/intl/hyphenation/glue/hnjstdio.cpp +++ b/intl/hyphenation/glue/hnjstdio.cpp @@ -22,6 +22,7 @@ struct hnjFile_ { char mBuffer[BUFSIZE]; uint32_t mCurPos; uint32_t mLimit; + bool mEOF; }; // replacement for fopen() @@ -58,6 +59,7 @@ hnjFopen(const char* aURISpec, const char* aMode) f->mStream = instream; f->mCurPos = 0; f->mLimit = 0; + f->mEOF = false; return f; } @@ -79,6 +81,27 @@ hnjFclose(hnjFile* f) return result; } +// replacement for fgetc() +int +hnjFgetc(hnjFile* f) +{ + if (f->mCurPos >= f->mLimit) { + f->mCurPos = 0; + + nsresult rv = f->mStream->Read(f->mBuffer, BUFSIZE, &f->mLimit); + if (NS_FAILED(rv)) { + f->mLimit = 0; + } + + if (f->mLimit == 0) { + f->mEOF = true; + return EOF; + } + } + + return f->mBuffer[f->mCurPos++]; +} + // replacement for fgets() // (not a full reimplementation, but sufficient for libhyphen's needs) char* @@ -88,24 +111,15 @@ hnjFgets(char* s, int n, hnjFile* f) int i = 0; while (i < n - 1) { - if (f->mCurPos < f->mLimit) { - char c = f->mBuffer[f->mCurPos++]; - s[i++] = c; - if (c == '\n' || c == '\r') { - break; - } - continue; - } - - f->mCurPos = 0; + int c = hnjFgetc(f); - nsresult rv = f->mStream->Read(f->mBuffer, BUFSIZE, &f->mLimit); - if (NS_FAILED(rv)) { - f->mLimit = 0; - return nullptr; + if (c == EOF) { + break; } - if (f->mLimit == 0) { + s[i++] = c; + + if (c == '\n' || c == '\r') { break; } } @@ -117,3 +131,9 @@ hnjFgets(char* s, int n, hnjFile* f) s[i] = '\0'; // null-terminate the returned string return s; } + +int +hnjFeof(hnjFile* f) +{ + return f->mEOF ? EOF : 0; +}

1 0

[tor/maint-0.3.4] Fix compilation of Rust crypto doctests
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit bfd36177c46e3348989c55bdfdacf5e694b4766b Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Jun 18 13:41:38 2018 -0500 Fix compilation of Rust crypto doctests The doctests for src/rust/crypto don't compile for multiple reasons, including some missing exports and incorrect identifier paths. Fixes bug 26415; bugfix on 0.3.4.1-alpha. --- changes/bug26415 | 3 +++ src/rust/crypto/digests/sha2.rs | 24 ++++++++++++------------ src/rust/crypto/lib.rs | 14 +++++++------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/changes/bug26415 b/changes/bug26415 new file mode 100644 index 000000000..497fbb736 --- /dev/null +++ b/changes/bug26415 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Fix compilation of the doctests in the Rust crypto crate. Fixes + bug 26415; bugfix on 0.3.4.1-alpha. diff --git a/src/rust/crypto/digests/sha2.rs b/src/rust/crypto/digests/sha2.rs index 1cbb6c581..62863aaa4 100644 --- a/src/rust/crypto/digests/sha2.rs +++ b/src/rust/crypto/digests/sha2.rs @@ -44,9 +44,9 @@ pub struct Sha256 { /// # Examples /// /// ``` -/// use crypto::digest::Sha256; +/// use crypto::digests::sha2::{Sha256, Digest}; /// -/// let hasher: Sha256 = Sha256::default(); +/// let mut hasher: Sha256 = Sha256::default(); /// ``` /// /// # Returns @@ -67,12 +67,12 @@ impl BlockInput for Sha256 { /// # Examples /// /// ``` -/// use crypto::digest::Sha256; +/// use crypto::digests::sha2::{Sha256, Digest}; /// -/// let hasher: Sha256 = Sha256::default(); +/// let mut hasher: Sha256 = Sha256::default(); /// -/// hasher.process(b"foo"); -/// hasher.process(b"bar"); +/// hasher.input(b"foo"); +/// hasher.input(b"bar"); /// ``` impl Input for Sha256 { fn process(&mut self, msg: &[u8]) { @@ -111,9 +111,9 @@ pub struct Sha512 { /// # Examples /// /// ``` -/// use crypto::digest::Sha512; +/// use crypto::digests::sha2::{Sha512, Digest}; /// -/// let hasher: Sha256 = Sha512::default(); +/// let mut hasher: Sha512 = Sha512::default(); /// ``` /// /// # Returns @@ -134,12 +134,12 @@ impl BlockInput for Sha512 { /// # Examples /// /// ``` -/// use crypto::digest::Sha512; +/// use crypto::digests::sha2::{Sha512, Digest}; /// -/// let hasher: Sha512 = Sha512::default(); +/// let mut hasher: Sha512 = Sha512::default(); /// -/// hasher.process(b"foo"); -/// hasher.process(b"bar"); +/// hasher.input(b"foo"); +/// hasher.input(b"bar"); /// ``` impl Input for Sha512 { fn process(&mut self, msg: &[u8]) { diff --git a/src/rust/crypto/lib.rs b/src/rust/crypto/lib.rs index b4250dec3..d120635b9 100644 --- a/src/rust/crypto/lib.rs +++ b/src/rust/crypto/lib.rs @@ -10,18 +10,18 @@ //! and extendable output functions. //! //! ``` -//! use crypto::digests::sha256::Sha256; +//! use crypto::digests::sha2::*; //! -//! let hasher: Sha256 = Sha256::default(); +//! let mut hasher: Sha256 = Sha256::default(); //! let mut result: [u8; 32] = [0u8; 32]; //! -//! hasher.input("foo"); -//! hasher.input("bar"); -//! hasher.input("baz"); +//! hasher.input(b"foo"); +//! hasher.input(b"bar"); +//! hasher.input(b"baz"); //! -//! result.copy_from_slice(hasher.result().as_bytes()); +//! result.copy_from_slice(hasher.result().as_slice()); //! -//! assert!(result == "XXX"); +//! assert!(result == [b'X'; DIGEST256_LEN]); //! ``` #[deny(missing_docs)]

1 0

[tor/release-0.3.4] Fix compilation of Rust crypto doctests
by nickm＠torproject.org 20 Jun '18

20 Jun '18

1 0

[tor/maint-0.3.4] Merge remote-tracking branch 'catalyst-github/bug26415_034' into maint-0.3.4
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit ac1747e47fc8a8486df3844045238f72bd4985fe Merge: e309aa4c8 bfd36177c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 07:35:13 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug26415_034' into maint-0.3.4 changes/bug26415 | 3 +++ src/rust/crypto/digests/sha2.rs | 24 ++++++++++++------------ src/rust/crypto/lib.rs | 14 +++++++------- 3 files changed, 22 insertions(+), 19 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'catalyst-github/bug26415_034' into maint-0.3.4
by nickm＠torproject.org 20 Jun '18

20 Jun '18

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018