January 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 21dd3ece620f4790b9431a2dffbc5df66b4fd251 Merge: 00bc18b84 4159d103d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:56 2019 -0500 Merge branch 'maint-0.3.5' changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0

[tor/master] Log more messages when failing to decode RSA keys
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 0981ac4c59f04a9de76224abf75a94a6fcc0542c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 14:33:40 2019 -0500 Log more messages when failing to decode RSA keys We log these messages at INFO level, except when we are reading a private key from a file, in which case we log at WARN. This fixes a regression from when we re-wrote our PEM code to be generic between nss and openssl. Fixes bug 29042, bugfix on 0.3.5.1-alpha. --- changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/changes/bug29042 b/changes/bug29042 new file mode 100644 index 000000000..ecbcdeeec --- /dev/null +++ b/changes/bug29042 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log more information at "warning" level when unable to read a private + key; log more information ad "info" level when unable to read a public + key. We had warnings here before, but they were lost during our + NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 8cc62bc18..2b977b0b9 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -21,6 +21,7 @@ #include "lib/log/util_bug.h" #include "lib/fs/files.h" +#include "lib/log/escape.h" #include "lib/log/log.h" #include "lib/encoding/binascii.h" #include "lib/encoding/pem.h" @@ -484,11 +485,13 @@ crypto_pk_write_private_key_to_string(crypto_pk_t *env, */ static int crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, - size_t len, bool private_key) + size_t len, int severity, + bool private_key) { if (len == (size_t)-1) // "-1" indicates "use the length of the string." len = strlen(src); + const char *ktype = private_key ? "private key" : "public key"; const char *tag = private_key ? RSA_PRIVATE_TAG : RSA_PUBLIC_TAG; size_t buflen = len; @@ -496,14 +499,20 @@ crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, int rv = -1; int n = pem_decode(buf, buflen, src, len, tag); - if (n < 0) + if (n < 0) { + log_fn(severity, LD_CRYPTO, + "Error decoding PEM wrapper while reading %s", ktype); goto done; + } crypto_pk_t *pk = private_key ? crypto_pk_asn1_decode_private((const char*)buf, n) : crypto_pk_asn1_decode((const char*)buf, n); - if (! pk) + if (! pk) { + log_fn(severity, LD_CRYPTO, + "Error decoding ASN.1 while reading %s", ktype); goto done; + } if (private_key) crypto_pk_assign_private(env, pk); @@ -526,7 +535,7 @@ int crypto_pk_read_public_key_from_string(crypto_pk_t *env, const char *src, size_t len) { - return crypto_pk_read_from_string_generic(env, src, len, false); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, false); } /** Read a PEM-encoded private key from the len-byte string src @@ -537,7 +546,7 @@ int crypto_pk_read_private_key_from_string(crypto_pk_t *env, const char *src, ssize_t len) { - return crypto_pk_read_from_string_generic(env, src, len, true); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, true); } /** If a file is longer than this, we won't try to decode its private key */ @@ -552,15 +561,24 @@ crypto_pk_read_private_key_from_filename(crypto_pk_t *env, { struct stat st; char *buf = read_file_to_str(keyfile, 0, &st); - if (!buf) + if (!buf) { + log_warn(LD_CRYPTO, "Unable to read file for private key in %s", + escaped(keyfile)); return -1; + } if (st.st_size > MAX_PRIVKEY_FILE_LEN) { + log_warn(LD_CRYPTO, "Private key file %s was far too large.", + escaped(keyfile)); tor_free(buf); return -1; } - int rv = crypto_pk_read_private_key_from_string(env, buf, - (ssize_t)st.st_size); + int rv = crypto_pk_read_from_string_generic(env, buf, (ssize_t)st.st_size, + LOG_WARN, true); + if (rv < 0) { + log_warn(LD_CRYPTO, "Unable to decode private key from file %s", + escaped(keyfile)); + } memwipe(buf, 0, (size_t)st.st_size); tor_free(buf); return rv;

1 0

[tor/release-0.3.5] Log more messages when failing to decode RSA keys
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 0981ac4c59f04a9de76224abf75a94a6fcc0542c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 14:33:40 2019 -0500 Log more messages when failing to decode RSA keys We log these messages at INFO level, except when we are reading a private key from a file, in which case we log at WARN. This fixes a regression from when we re-wrote our PEM code to be generic between nss and openssl. Fixes bug 29042, bugfix on 0.3.5.1-alpha. --- changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/changes/bug29042 b/changes/bug29042 new file mode 100644 index 000000000..ecbcdeeec --- /dev/null +++ b/changes/bug29042 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log more information at "warning" level when unable to read a private + key; log more information ad "info" level when unable to read a public + key. We had warnings here before, but they were lost during our + NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 8cc62bc18..2b977b0b9 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -21,6 +21,7 @@ #include "lib/log/util_bug.h" #include "lib/fs/files.h" +#include "lib/log/escape.h" #include "lib/log/log.h" #include "lib/encoding/binascii.h" #include "lib/encoding/pem.h" @@ -484,11 +485,13 @@ crypto_pk_write_private_key_to_string(crypto_pk_t *env, */ static int crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, - size_t len, bool private_key) + size_t len, int severity, + bool private_key) { if (len == (size_t)-1) // "-1" indicates "use the length of the string." len = strlen(src); + const char *ktype = private_key ? "private key" : "public key"; const char *tag = private_key ? RSA_PRIVATE_TAG : RSA_PUBLIC_TAG; size_t buflen = len; @@ -496,14 +499,20 @@ crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, int rv = -1; int n = pem_decode(buf, buflen, src, len, tag); - if (n < 0) + if (n < 0) { + log_fn(severity, LD_CRYPTO, + "Error decoding PEM wrapper while reading %s", ktype); goto done; + } crypto_pk_t *pk = private_key ? crypto_pk_asn1_decode_private((const char*)buf, n) : crypto_pk_asn1_decode((const char*)buf, n); - if (! pk) + if (! pk) { + log_fn(severity, LD_CRYPTO, + "Error decoding ASN.1 while reading %s", ktype); goto done; + } if (private_key) crypto_pk_assign_private(env, pk); @@ -526,7 +535,7 @@ int crypto_pk_read_public_key_from_string(crypto_pk_t *env, const char *src, size_t len) { - return crypto_pk_read_from_string_generic(env, src, len, false); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, false); } /** Read a PEM-encoded private key from the len-byte string src @@ -537,7 +546,7 @@ int crypto_pk_read_private_key_from_string(crypto_pk_t *env, const char *src, ssize_t len) { - return crypto_pk_read_from_string_generic(env, src, len, true); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, true); } /** If a file is longer than this, we won't try to decode its private key */ @@ -552,15 +561,24 @@ crypto_pk_read_private_key_from_filename(crypto_pk_t *env, { struct stat st; char *buf = read_file_to_str(keyfile, 0, &st); - if (!buf) + if (!buf) { + log_warn(LD_CRYPTO, "Unable to read file for private key in %s", + escaped(keyfile)); return -1; + } if (st.st_size > MAX_PRIVKEY_FILE_LEN) { + log_warn(LD_CRYPTO, "Private key file %s was far too large.", + escaped(keyfile)); tor_free(buf); return -1; } - int rv = crypto_pk_read_private_key_from_string(env, buf, - (ssize_t)st.st_size); + int rv = crypto_pk_read_from_string_generic(env, buf, (ssize_t)st.st_size, + LOG_WARN, true); + if (rv < 0) { + log_warn(LD_CRYPTO, "Unable to decode private key from file %s", + escaped(keyfile)); + } memwipe(buf, 0, (size_t)st.st_size); tor_free(buf); return rv;

1 0

[tor/release-0.3.5] Merge branch 'bug29042_035' into maint-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 4159d103d644101ab616973c9f7742821132ecbd Merge: 9ce1978b5 0981ac4c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:53 2019 -0500 Merge branch 'bug29042_035' into maint-0.3.5 changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 8c6fcf864b8c1e8fb7022bc8d91598ca0659afab Merge: 5dc6d2318 4159d103d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:56 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.3.5] Log more messages when failing to decode RSA keys
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 0981ac4c59f04a9de76224abf75a94a6fcc0542c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 16 14:33:40 2019 -0500 Log more messages when failing to decode RSA keys We log these messages at INFO level, except when we are reading a private key from a file, in which case we log at WARN. This fixes a regression from when we re-wrote our PEM code to be generic between nss and openssl. Fixes bug 29042, bugfix on 0.3.5.1-alpha. --- changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/changes/bug29042 b/changes/bug29042 new file mode 100644 index 000000000..ecbcdeeec --- /dev/null +++ b/changes/bug29042 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Log more information at "warning" level when unable to read a private + key; log more information ad "info" level when unable to read a public + key. We had warnings here before, but they were lost during our + NSS work. Fixes bug 28981; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c index 8cc62bc18..2b977b0b9 100644 --- a/src/lib/crypt_ops/crypto_rsa.c +++ b/src/lib/crypt_ops/crypto_rsa.c @@ -21,6 +21,7 @@ #include "lib/log/util_bug.h" #include "lib/fs/files.h" +#include "lib/log/escape.h" #include "lib/log/log.h" #include "lib/encoding/binascii.h" #include "lib/encoding/pem.h" @@ -484,11 +485,13 @@ crypto_pk_write_private_key_to_string(crypto_pk_t *env, */ static int crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, - size_t len, bool private_key) + size_t len, int severity, + bool private_key) { if (len == (size_t)-1) // "-1" indicates "use the length of the string." len = strlen(src); + const char *ktype = private_key ? "private key" : "public key"; const char *tag = private_key ? RSA_PRIVATE_TAG : RSA_PUBLIC_TAG; size_t buflen = len; @@ -496,14 +499,20 @@ crypto_pk_read_from_string_generic(crypto_pk_t *env, const char *src, int rv = -1; int n = pem_decode(buf, buflen, src, len, tag); - if (n < 0) + if (n < 0) { + log_fn(severity, LD_CRYPTO, + "Error decoding PEM wrapper while reading %s", ktype); goto done; + } crypto_pk_t *pk = private_key ? crypto_pk_asn1_decode_private((const char*)buf, n) : crypto_pk_asn1_decode((const char*)buf, n); - if (! pk) + if (! pk) { + log_fn(severity, LD_CRYPTO, + "Error decoding ASN.1 while reading %s", ktype); goto done; + } if (private_key) crypto_pk_assign_private(env, pk); @@ -526,7 +535,7 @@ int crypto_pk_read_public_key_from_string(crypto_pk_t *env, const char *src, size_t len) { - return crypto_pk_read_from_string_generic(env, src, len, false); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, false); } /** Read a PEM-encoded private key from the len-byte string src @@ -537,7 +546,7 @@ int crypto_pk_read_private_key_from_string(crypto_pk_t *env, const char *src, ssize_t len) { - return crypto_pk_read_from_string_generic(env, src, len, true); + return crypto_pk_read_from_string_generic(env, src, len, LOG_INFO, true); } /** If a file is longer than this, we won't try to decode its private key */ @@ -552,15 +561,24 @@ crypto_pk_read_private_key_from_filename(crypto_pk_t *env, { struct stat st; char *buf = read_file_to_str(keyfile, 0, &st); - if (!buf) + if (!buf) { + log_warn(LD_CRYPTO, "Unable to read file for private key in %s", + escaped(keyfile)); return -1; + } if (st.st_size > MAX_PRIVKEY_FILE_LEN) { + log_warn(LD_CRYPTO, "Private key file %s was far too large.", + escaped(keyfile)); tor_free(buf); return -1; } - int rv = crypto_pk_read_private_key_from_string(env, buf, - (ssize_t)st.st_size); + int rv = crypto_pk_read_from_string_generic(env, buf, (ssize_t)st.st_size, + LOG_WARN, true); + if (rv < 0) { + log_warn(LD_CRYPTO, "Unable to decode private key from file %s", + escaped(keyfile)); + } memwipe(buf, 0, (size_t)st.st_size); tor_free(buf); return rv;

1 0

[tor/maint-0.3.5] Merge branch 'bug29042_035' into maint-0.3.5
by nickm＠torproject.org 22 Jan '19

22 Jan '19

commit 4159d103d644101ab616973c9f7742821132ecbd Merge: 9ce1978b5 0981ac4c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 22 11:55:53 2019 -0500 Merge branch 'bug29042_035' into maint-0.3.5 changes/bug29042 | 5 +++++ src/lib/crypt_ops/crypto_rsa.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-)

1 0

[webwml/master] press.pl: catch \r in csv, add debugging option
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit 35de594a7ff2a72f213ff22ce3fed92cac67eb0f Author: traumschule <traumschuleriebau(a)riseup.net> Date: Wed Dec 19 16:26:14 2018 -0500 press.pl: catch \r in csv, add debugging option --- press/press.pl | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/press/press.pl b/press/press.pl index 914edcee..e1e329db 100755 --- a/press/press.pl +++ b/press/press.pl @@ -6,38 +6,53 @@ use Time::Piece; #use HTML::Escape qw/escape_html/; my %pub; # save all publications +my $debug = 0; +sub debug { + my $msg = shift; + print "$msg\n" if $debug; +} sub parse_line { my $str = shift; + debug "Parsing:\n$str"; if ($str =~ /(\d+\/\d+\/\d+),([^,]+),(.+),(.+)/) { # magic regex :) my $time = Time::Piece->strptime($1, "%m/%d/%y"); # given format: MM/DD/YY my $date = $time->strftime("%Y %b %d"); chomp(my $source = $2); - $pub{$time->epoch} = "<tr>\n<td>$date</td>\n<td>$source</td>\n<td><a href='$4'>\n$3</a></td>\n</tr>\n\n"; + $pub{$time->epoch} .= "<tr>\n<td>$date</td>\n<td>$source</td>\n<td><a href='$4'>\n$3</a></td>\n</tr>\n\n"; + # TODO use uniqe keys to avoid .= + debug "Added: $pub{$time->epoch}" } } -unless (@ARGV) { print "Usage: $0 /path/to/csv/file > file\n"; exit 1; } +unless (@ARGV) { print "Usage: $0 [-d] /path/to/csv/file > file\n"; exit 1; } # parse all arguments (hopefully existing files) foreach my $arg (@ARGV) { chomp($arg); - if (-f $arg) { - # we are lucky, this looks like a file + debug "arg: $arg"; + if ($arg eq '-d') { + $debug++; + debug "Enabling debug output on request." + } elsif (-f "$arg") { + debug 'argument looks like a file.'; open my $fh, '<', $arg - or warn "Can't open '$arg': $!\n" and next; + or die "Can't open '$arg': $!\n"; + debug "Reading $arg."; foreach (<$fh>) { - parse_line $_; + # https://stackoverflow.com/questions/6373888/converting-newline-formatting-f… + foreach my $line (split '\r', $_) { + parse_line $line; + } } - close $fh; + close $fh; debug "Finished reading $arg." } else { - # this is no file, let's assume we got piped a string to parse + debug 'argument is no file, assuming piped string.'; parse_line $arg; } } -# share our treasure with the world my $str = join '', map { $pub{$_} } reverse sort keys %pub; -if ($str) { print $str; } +debug "Generated final html string (". (scalar keys %pub) ." entries):"; +if ($str) { print "$str\nAdd above to press/en/press.wml.\n"; } else { print "Nothing found.\n"; exit 1; } -# TODO one day i want to able to update press/en/press.wml directly

1 0

[webwml/master] add press clips (#28900)
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit 02c1fc41c8cc220a3ff557e5e19ebdddda142492 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Wed Dec 19 16:24:51 2018 -0500 add press clips (#28900) --- press/en/press.wml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 717e0a8f..4a042c45 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -51,6 +51,27 @@ some of the significant Tor-related stories that have popped up. </thead> <tr> +<td>2018 Dec 18</td> +<td>BoingBoing</td> +<td><a href='https://boingboing.net/2018/12/18/charitablegivinguide.html'> +Charitable Giving Guide 2018</a></td> +</tr> + +<tr> +<td>2018 Dec 10</td> +<td>ZDNet</td> +<td><a href='https://www.zdnet.com/article/half-of-the-tor-projects-funding-now-comes-fr…'> +Half of the Tor Project's funding now comes from the private sector</a></td> +</tr> + +<tr> +<td>2018 Dec 10</td> +<td>CyberScoop</td> +<td><a href='https://www.cyberscoop.com/tor-funding-isabela-bagueros-december-2018/'> +"With new director, Tor seeks new funding sources and international growth"</a></td> +</tr> + +<tr> <td>2018 Nov 02</td> <td>Motherboard</td> <td><a href='https://motherboard.vice.com/en_us/article/zm9jd4/old-school-sniffing-attac…'>

1 0

[webwml/master] Add newest press clips (#28900)
by hiro＠torproject.org 22 Jan '19

22 Jan '19

commit d4634a9e4404cf97bdb1e4f7622f5e1c58d03567 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Tue Jan 15 11:02:34 2019 -0500 Add newest press clips (#28900) --- press/en/press.wml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 4a042c45..8463a550 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -51,6 +51,20 @@ some of the significant Tor-related stories that have popped up. </thead> <tr> +<td>2019 Jan 11</td> +<td>TechCrunch</td> +<td><a href='https://techcrunch.com/2019/01/11/tor-lessens-reliance-us-grants/'> +Tor pulls in record donations as it lessens reliance on US government grants</a></td> +</tr> + +<tr> +<td>2019 Jan 01</td> +<td>Wired</td> +<td><a href='https://www.wired.com/story/tor-anonymity-easier-than-ever/'> +Tor Is Easier Than Ever. Time to Give It a Try</a></td> +</tr> + +<tr> <td>2018 Dec 18</td> <td>BoingBoing</td> <td><a href='https://boingboing.net/2018/12/18/charitablegivinguide.html'>

1 0