September 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Add the update responses script
by gk＠torproject.org 26 Sep '14

26 Sep '14

commit c2b76dcc4a854d7cecb44acac2bea1cf23cf51e6 Author: Nicolas Vigier <boklm(a)mars-attacks.org> Date: Thu Sep 25 19:39:19 2014 +0200 Add the update responses script Add the update responses script in directory tools/update-responses. This adds the content of commit 2c3625507a5c12b4c15b6681a8b694114a0cfb7b from https://github.com/boklm/tb-update-response. --- tools/update-responses/.gitignore | 1 + tools/update-responses/README.md | 45 +++++++ tools/update-responses/config.yml | 16 +++ tools/update-responses/htdocs/no-update.xml | 2 + tools/update-responses/update_responses | 169 +++++++++++++++++++++++++++ 5 files changed, 233 insertions(+) diff --git a/tools/update-responses/.gitignore b/tools/update-responses/.gitignore new file mode 100644 index 0000000..c077014 --- /dev/null +++ b/tools/update-responses/.gitignore @@ -0,0 +1 @@ +htdocs diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md new file mode 100644 index 0000000..ee21bac --- /dev/null +++ b/tools/update-responses/README.md @@ -0,0 +1,45 @@ +Tor Browser Update Responses script +=================================== + +This repository contains a script to generate responses for Tor Browser +updater. + +See ticket [#12622](https://trac.torproject.org/projects/tor/ticket/12622) +for details. + + +Dependencies +------------ + +The following perl modules need to be installed to run the script: + FindBin YAML File::Slurp Digest::SHA XML::Writer + +On Debian / Ubuntu you can install them with: + +``` + # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ + libdigest-sha-perl libxml-writer-perl +``` + +On Red Hat / Fedora you can install them with: + +``` + # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer + do yum install "perl($module)"; done +``` + + +URL Format +---------- + +The URL format is: + https://something/$channel/$build_target/$tb_version/$lang?force=1 + +'build_target' is the OS for which the browser was built. The correspo +ndance between the build target and the OS name that we use in archive +files is defined in the config.yml file. + +'tb_version' is the Tor Browser version. + +'lang' is the locale. + diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml new file mode 100644 index 0000000..8b5475a --- /dev/null +++ b/tools/update-responses/config.yml @@ -0,0 +1,16 @@ +--- +build_targets: + linux32: Linux_x86-gcc3 + linux64: Linux_x86_64-gcc3 + win32: WINNT_x86-gcc3 + osx32: Darwin_x86-gcc3 +channels: + alpha: 4.0-alpha-3 +versions: + 4.0-alpha-3: + platformVersion: 24.8.1 + detailsURL: https://www.torproject.org/projects/torbrowser.html.en + download_url: https://www.torproject.org/dist/torbrowser/4.0-alpha-3 +# osx32: +# minSupportedOSVersion: 10.7 +# unsupported: 1 diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml new file mode 100644 index 0000000..910e99d --- /dev/null +++ b/tools/update-responses/htdocs/no-update.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates></updates> diff --git a/tools/update-responses/releases/.directory b/tools/update-responses/releases/.directory new file mode 100644 index 0000000..e69de29 diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses new file mode 100755 index 0000000..e082592 --- /dev/null +++ b/tools/update-responses/update_responses @@ -0,0 +1,169 @@ +#!/usr/bin/perl -w + +use strict; +use FindBin; +use YAML qw(LoadFile); +use File::Slurp; +use Digest::SHA; +use XML::Writer; + +my $htdocsdir = "$FindBin::Bin/htdocs"; +my $config = LoadFile("$FindBin::Bin/config.yml"); +my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + exit (exists $_[1] ? $_[1] : 1); +} + +sub build_target_by_os { + $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +} + +sub write_htdocs { + my ($file, $content) = @_; + mkdir $htdocsdir unless -d $htdocsdir; + write_file("$htdocsdir/$file", $content); + $htdocsfiles{$file} = 1; +} + +sub clean_htdocs { + opendir(my $d, $htdocsdir); + my @files = grep { ! $htdocsfiles{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$_" } @files; +} + +sub get_sha512_hex_of_file { + my ($file) = @_; + my $sha = Digest::SHA->new("512"); + $sha->addfile($file); + return $sha->hexdigest; +} + +sub get_version_files { + my ($config, $version) = @_; + return if $config->{versions}{$version}{files}; + my $files = {}; + my $vdir = "$FindBin::Bin/releases/$version"; + opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; + foreach my $file (readdir $d) { + next unless -f "$vdir/$file"; + if ($file =~ m/^tor-browser-([^-]+)-${version}_(.+)\.mar$/) { + my ($os, $lang) = ($1, $2); + $files->{$os}{$lang}{complete} = { + type => 'complete', + URL => "$config->{versions}{$version}{download_url}/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + }; + next; + } + if ($file =~ m/^tor-browser-([^-]+)-([^-]+)-${version}_(.+)\.mar$/) { + my ($os, $from_version, $lang) = ($1, $2, $3); + $files->{$os}{$lang}{partial}{$from_version} = { + type => 'partial', + URL => "$config->{versions}{$version}{download_url}/$file", + size => -s "$vdir/$file", + hashFunction => 'SHA512', + hashValue => get_sha512_hex_of_file("$vdir/$file"), + } + } + } + closedir $d; + $config->{versions}{$version}{files} = $files; +} + +sub get_config { + my ($config, $version, $os, $name) = @_; + return $config->{versions}{$version}{$os}{$name} + // $config->{versions}{$version}{$name} + // $config->{$name}; +} + +sub get_response { + my ($config, $version, $os, @patches) = @_; + my $res; + my $writer = XML::Writer->new(OUTPUT => \$res, ENCODING => 'UTF-8'); + $writer->xmlDecl; + $writer->startTag('updates'); + if (get_config($config, $version, $os, 'unsupported')) { + $writer->startTag('update', + unsupported => 'true', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + ); + goto CLOSETAGS; + } + my $minversion = get_config($config, $version, $os, 'minSupportedOSVersion'); + $writer->startTag('update', + type => 'minor', + displayVersion => $version, + appVersion => $version, + platformVersion => get_config($config, $version, $os, 'platformVersion'), + buildID => '20000101000000', + detailsURL => get_config($config, $version, $os, 'detailsURL'), + defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), + ); + foreach my $patch (@patches) { + $writer->startTag('patch', %$patch); + $writer->endTag('patch'); + } + CLOSETAGS: + $writer->endTag('update'); + $writer->endTag('updates'); + $writer->end; + return $res; +} + +sub write_responses { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + my $files = $config->{versions}{$version}{files}; + foreach my $os (keys %$files) { + foreach my $lang (keys %{$files->{$os}}) { + my $resp = get_response($config, $version, $os, + $files->{$os}{$lang}{complete}); + write_htdocs("$version-$os-$lang.xml", $resp); + foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + $resp = get_response($config, $version, $os, + $files->{$os}{$lang}{complete}, + $files->{$os}{$lang}{partial}{$from_version}); + write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + } + } + } + } +} + +sub write_htaccess { + my ($config) = @_; + my $htaccess = "RewriteEngine On\n"; + my $flags = "[last]"; + foreach my $channel (keys %{$config->{channels}}) { + my $version = $config->{channels}{$channel}; + my $files = $config->{versions}{$version}{files}; + $htaccess .= "RewriteRule " + . "^$channel/[^\/]+/$version/ " + . "no-update.xml $flags\n"; + foreach my $os (keys %$files) { + my $bt = build_target_by_os($os); + foreach my $lang (keys %{$files->{$os}}) { + foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$channel/$bt " + . "$version-$os-en-US.xml $flags\n"; + } + } + write_htdocs('.htaccess', $htaccess); +} + +write_responses($config); +write_htaccess($config); +clean_htdocs;

1 0

[tor/master] Avoid a "constant variable guards dead code" warning from coverity
by nickm＠torproject.org 26 Sep '14

26 Sep '14

commit 6e7cbfc465f9cbb2bd24ebeb019f542b2f4ccb2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 26 09:40:30 2014 -0400 Avoid a "constant variable guards dead code" warning from coverity Fixes CID 752028 --- src/common/compat_libevent.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 74b54bb..7e6f304 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -210,6 +210,9 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) } else { using_iocp_bufferevents = 0; } +#elif defined(__COVERITY__) + /* Avoid a 'dead code' warning below. */ + using_threads = ! torcfg->disable_iocp; #endif if (!using_threads) {

1 0

[tor/master] Regenerate pwbox.c with the latest trunnel
by nickm＠torproject.org 26 Sep '14

26 Sep '14

commit 9fd6fbec280ea07326f0d4a0e9289609fafd7ef1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 26 09:33:24 2014 -0400 Regenerate pwbox.c with the latest trunnel This one should no longer generate dead-code warnings with coverity. Fingers crossed? This was CID 1241498 --- src/trunnel/pwbox.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c index b70e1d8..bfea3ac 100644 --- a/src/trunnel/pwbox.c +++ b/src/trunnel/pwbox.c @@ -12,6 +12,22 @@ (obj)->trunnel_error_code_ = 1; \ } while (0) +#if defined(__COVERITY__) || defined(__clang_analyzer__) +/* If we're runnning a static analysis tool, we don't want it to complain + * that some of our remaining-bytes checks are dead-code. */ +int pwbox_deadcode_dummy__ = 0; +#define OR_DEADCODE_DUMMY || pwbox_deadcode_dummy__ +#else +#define OR_DEADCODE_DUMMY +#endif + +#define CHECK_REMAINING(nbytes, label) \ + do { \ + if (remaining < (nbytes) OR_DEADCODE_DUMMY) { \ + goto label; \ + } \ + } while (0) + pwbox_encoded_t * pwbox_encoded_new(void) { @@ -422,49 +438,38 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_ (void)result; /* Parse u32 fixedbytes0 IN [PWBOX0_CONST0] */ - if (remaining < 4) - goto truncated; + CHECK_REMAINING(4, truncated); obj->fixedbytes0 = trunnel_ntohl(trunnel_get_uint32(ptr)); remaining -= 4; ptr += 4; if (! (obj->fixedbytes0 == PWBOX0_CONST0)) goto fail; /* Parse u32 fixedbytes1 IN [PWBOX0_CONST1] */ - if (remaining < 4) - goto truncated; + CHECK_REMAINING(4, truncated); obj->fixedbytes1 = trunnel_ntohl(trunnel_get_uint32(ptr)); remaining -= 4; ptr += 4; if (! (obj->fixedbytes1 == PWBOX0_CONST1)) goto fail; /* Parse u8 header_len */ - if (remaining < 1) - goto truncated; + CHECK_REMAINING(1, truncated); obj->header_len = (trunnel_get_uint8(ptr)); remaining -= 1; ptr += 1; /* Parse u8 skey_header[header_len] */ - if (remaining < obj->header_len) - goto truncated; + CHECK_REMAINING(obj->header_len, truncated); TRUNNEL_DYNARRAY_EXPAND(uint8_t, &obj->skey_header, obj->header_len, {}); obj->skey_header.n_ = obj->header_len; memcpy(obj->skey_header.elts_, ptr, obj->header_len); ptr += obj->header_len; remaining -= obj->header_len; /* Parse u8 iv[16] */ - if (remaining < (16)) - goto truncated; + CHECK_REMAINING(16, truncated); memcpy(obj->iv, ptr, 16); - { - unsigned idx; - for (idx = 0; idx < 16; ++idx) - obj->iv[idx] = (obj->iv[idx]); - } remaining -= 16; ptr += 16; { size_t remaining_after; - if (remaining < 32) - goto truncated; + CHECK_REMAINING(32, truncated); remaining_after = 32; remaining = remaining - 32; @@ -479,14 +484,8 @@ pwbox_encoded_parse_into(pwbox_encoded_t *obj, const uint8_t *input, const size_ } /* Parse u8 hmac[32] */ - if (remaining < (32)) - goto truncated; + CHECK_REMAINING(32, truncated); memcpy(obj->hmac, ptr, 32); - { - unsigned idx; - for (idx = 0; idx < 32; ++idx) - obj->hmac[idx] = (obj->hmac[idx]); - } remaining -= 32; ptr += 32; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining;

1 0

[trunnel/master] Suppress deadcode warnings from static analysis tools
by nickm＠torproject.org 26 Sep '14

26 Sep '14

commit 3ddd61e0f7fc81e8067c5ca10eda6c832055b963 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 26 09:28:10 2014 -0400 Suppress deadcode warnings from static analysis tools It's intentional that trunnel will generate some dead checks: I deliberately wrote it to _always_ check how many bytes are remaining, even if the check might be dead. The alternative would be to make the code more complex in order to teach it how to sometimes omit checks... but such complexity would run the risk of accidentally omitting a necessary check. So replace the "if (remaining < foo) goto bar;" checks with a macro, and use an #ifdef to define the macro such that the static tool (probably) won't conclude that check can never be true. --- lib/trunnel/CodeGen.py | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 392783b..9b07e2f 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -2406,8 +2406,7 @@ class ParseFnGenerator(CodeGenerator): ntoh = NTOH_FN[width] self.needLabels.add(self.truncatedLabel) self.format(""" - if (remaining < {nbytes}) - goto {truncated}; + CHECK_REMAINING({nbytes}, {truncated}); {element} = {ntoh}(trunnel_get_uint{width}(ptr)); remaining -= {nbytes}; ptr += {nbytes}; """, nbytes=nbytes, truncated=self.truncatedLabel, @@ -2463,8 +2462,7 @@ class ParseFnGenerator(CodeGenerator): if bytesPerElt > 1: multiplier = "%s * " % bytesPerElt self.format(""" - if (remaining < ({multiplier}{width})) - goto {truncated}; + CHECK_REMAINING({multiplier}{width}, {truncated}); memcpy(obj->{c_name}, ptr, {multiplier}{width}); """, c_name=sfa.c_name, multiplier=multiplier, width=sfa.width, truncated=self.truncatedLabel) @@ -2523,7 +2521,7 @@ class ParseFnGenerator(CodeGenerator): # FFFF some of this is kinda cut-and-paste if arrayIsBytes(sva): if sva.widthfield != None: - self.w('if (remaining < %s)\n goto %s;\n' % ( + self.w('CHECK_REMAINING(%s, %s);\n' % ( w, self.truncatedLabel)) else: w = "remaining" @@ -2643,8 +2641,7 @@ class ParseFnGenerator(CodeGenerator): self.format(""" {{ size_t remaining_after; - if ({field} > remaining) - goto {truncated}; + CHECK_REMAINING({field}, {truncated}); remaining_after = remaining - {field}; remaining = {field}; """, field=field_, truncated=self.truncatedLabel) @@ -2652,8 +2649,7 @@ class ParseFnGenerator(CodeGenerator): self.format(""" {{ size_t remaining_after; - if (remaining < {leftafter}) - goto {truncated}; + CHECK_REMAINING({leftafter}, {truncated}); remaining_after = {leftafter}; remaining = remaining - {leftafter}; """, leftafter=sml.leftoverbytes, @@ -2748,6 +2744,22 @@ MODULE_BOILERPLATE = """\ (obj)->trunnel_error_code_ = 1; \\ } while (0) +#if defined(__COVERITY__) || defined(__clang_analyzer__) +/* If we're runnning a static analysis tool, we don't want it to complain + * that some of our remaining-bytes checks are dead-code. */ +int %(csafe_fname)s_deadcode_dummy__ = 0; +#define OR_DEADCODE_DUMMY || %(csafe_fname)s_deadcode_dummy__ +#else +#define OR_DEADCODE_DUMMY +#endif + +#define CHECK_REMAINING(nbytes, label) \\ + do { \\ + if (remaining < (nbytes) OR_DEADCODE_DUMMY) { \\ + goto label; \\ + } \\ + } while (0) + """ @@ -2765,6 +2777,7 @@ def generate_code(input_fname, extra_options=[], target_dir=None): c_fname = basename + ".c" h_fname = basename + ".h" + csafe_fname = re.sub(r'[^a-zA-Z]', '', os.path.split(basename)[1]) inp = open(input_fname, 'r') t = trunnel.Grammar.Lexer().tokenize(inp.read()) @@ -2787,6 +2800,7 @@ def generate_code(input_fname, extra_options=[], target_dir=None): 'guard_macro': guard_macro, 'h_fname': os.path.split(h_fname)[1], 'c_fname': os.path.split(c_fname)[1], + 'csafe_fname' : csafe_fname, 'expose_definitions': "".join(expose_definitions), 'version' : trunnel.__version__ }

1 0

[support-tools/master] expire-old-tickets: add new script to remove old information from RT database
by lunar＠torproject.org 26 Sep '14

26 Sep '14

commit b86a05ebfc3c5145191a17079a6601c4300dd749 Author: Lunar <lunar(a)torproject.org> Date: Fri Sep 26 15:10:45 2014 +0200 expire-old-tickets: add new script to remove old information from RT database --- expire-old-tickets/expire-old-tickets | 123 +++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/expire-old-tickets/expire-old-tickets b/expire-old-tickets/expire-old-tickets new file mode 100755 index 0000000..3cc82e0 --- /dev/null +++ b/expire-old-tickets/expire-old-tickets @@ -0,0 +1,123 @@ +#!/bin/sh +# +# This program is free software. It comes without any warranty, to +# the extent permitted by applicable law. You can redistribute it +# and/or modify it under the terms of the Do What The Fuck You Want +# To Public License, Version 2, as published by Sam Hocevar. See +# http://sam.zoy.org/wtfpl/COPYING for more details. +# +# This script will use rt-shredder to remove old tickets and users from the RT +# database, and then encrypt the saved sqldump. + +set -e + +# GnuPG keys used to encrypt the sql dumps +KEYS="$(grep -v '^[^[:space:]]*#' <<END_OF_KEYS)" +# andrew +0291ECCBE42B22068E685545627DEE286B4D6475 +# roger +F65CE37F04BA5B360AE6EE17C218525819F78451 +# nick +B35BF85BF19489D04E28C33C21194EBB165733EA +# mikeperry +C963C21D63564E2B10BB335B29846B3C683686CC +# lunar +0603CCFD91865C17E88D4C798382C95C29023DF9 +END_OF_KEYS + +# How long must we keep old tickets +EXPIRE_AFTER="100" # days + +# Where to write the SQL dumps +DUMP_DIR="/srv/rtstuff/shredded" + +# Free space requirement in $DUMP_DIR +MIN_STORAGE_SPACE="50" # MB + +warn_about_upcoming_expirations() { + local key + local info + local main_uid + local expiration_date + local in_ten_days_epoch + local expiration_epoch + + for key in $KEYS; do + info="$(gpg --batch --quiet --list-keys --with-colons "$key")" + main_uid="$(echo "$info" | awk -F: '$1 ~ /^pub$/ { print $10 }')" + for expiration_date in $(echo "$info" | awk -F: '$2 ~ /^[^e]$/ { if (($1 == "pub") || ($1 == "sub" && $12 == "e")) { print $7 } }'); do + in_ten_days_epoch="$(date --date='+10 days' +%s)" + expiration_epoch="$(date --date="$expiration_date" +%s)" + if [ "$in_ten_days_epoch" -gt "$expiration_epoch" ]; then + echo "Warning! $main_uid expires on $expiration_date." + fi + done + done +} + +encrypt() { + local key + local recipients + + for key in $KEYS; do + recipients="${recipients:+$recipients }--recipient $key" + done + gpg --batch --always-trust $recipients --encrypt +} + +is_encryption_working() { + echo 'test' | encrypt > /dev/null + +} + +is_there_enough_free_space() { + local free_space + local min_space_in_kbytes + + free_space="$(df -P -k "$DUMP_DIR" | awk '/^\// { print $4 }')" + min_space_in_kbytes="$(expr "$MIN_STORAGE_SPACE" '*' 1024 '*' 1024)" + test "$free_space" -le "$min_space_in_kbytes" +} + +fill_rt_config() { + local file="$1" + + cat /etc/request-tracker4/RT_SiteConfig.d/[0-9][0-9]* > "$file" + echo "1;" >> "$file" +} + +if ! [ -d "$DUMP_DIR" ]; then + echo "$DUMP_DIR does not exist. Exiting." >&2 + exit 1 +fi + +if ! is_there_enough_free_space; then + echo "$DUMP_DIR has less than $MIN_STORAGE_SPACE MB of available disk space. Exiting." >&2 + exit 1 +fi + +warn_about_upcoming_expirations + +if ! is_encryption_working; then + echo "Encryption is not working as it should. Exiting." >&2 + exit 1 +fi + +# Re-create RT_SiteConfig.pm from .d directory as we don't have the rights to +# read /etc/request-tracker4/RT_SiteConfig.pm +TMP_SITE_CONFIG=$(mktemp) +trap "rm -f '$TMP_SITE_CONFIG'" EXIT + +fill_rt_config "$TMP_SITE_CONFIG" + +DATE="$(date --date="-$EXPIRE_AFTER days" +%Y-%m-%d)" +TICKETS_SQL="$DUMP_DIR/tickets-shredded-$DATE.sql" +USERS_SQL="$DUMP_DIR/users-shredded-$DATE.sql" + +RT_SITE_CONFIG="$TMP_SITE_CONFIG" /usr/sbin/rt-shredder --force --sqldump "$TICKETS_SQL" --plugin "Tickets=query,(Status = 'resolved' OR Status = 'rejected' OR Status = 'deleted') AND LastUpdated < '$DATE';limit,999999999" +xz --stdout --compress "$TICKETS_SQL" | encrypt > "$TICKETS_SQL.xz.gpg" +shred -u -n 1 "$TICKETS_SQL" + +RT_SITE_CONFIG="$TMP_SITE_CONFIG" /usr/sbin/rt-shredder --force --sqldump "$USERS_SQL" --plugin "Users=status,any;member_of,Unprivileged;no_tickets,1;replace_relations,Nobody;limit,999999999" +xz --stdout --compress "$USERS_SQL" | encrypt > "$USERS_SQL.xz.gpg" +shred -u -n 1 "$USERS_SQL"

1 0

[tor/master] Check key_len in secret_to_key_new()
by nickm＠torproject.org 26 Sep '14

26 Sep '14

commit 7c52a0555aee23f171870c5d41ce3c0f593c2e57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 26 09:06:36 2014 -0400 Check key_len in secret_to_key_new() This bug shouldn't be reachable so long as secret_to_key_len and secret_to_key_make_specifier stay in sync, but we might screw up someday. Found by coverity; this is CID 1241500 --- src/common/crypto_s2k.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c index 93c96e7..aef8436 100644 --- a/src/common/crypto_s2k.c +++ b/src/common/crypto_s2k.c @@ -392,6 +392,9 @@ secret_to_key_new(uint8_t *buf, type = buf[0]; key_len = secret_to_key_key_len(type); + if (key_len < 0) + return key_len; + if ((int)buf_len < key_len + spec_len) return S2K_TRUNCATED;

1 0

[tor/master] Comment-out dead code in ed25519/ref10
by nickm＠torproject.org 26 Sep '14

26 Sep '14

commit 27bd1ef100a81235e9d2763c4cf24699251a8008 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 26 09:07:44 2014 -0400 Comment-out dead code in ed25519/ref10 There are some loops of the form for (i=1;i<1;++i) ... And of course, if the loop index is initialized to 1, it will never be less than 1, and the loop body will never be executed. This upsets coverity. Patch fixes CID 1221543 and 1221542 --- src/ext/ed25519/ref10/pow22523.h | 5 +++-- src/ext/ed25519/ref10/pow225521.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ext/ed25519/ref10/pow22523.h b/src/ext/ed25519/ref10/pow22523.h index 60ffe0d..9204ff8 100644 --- a/src/ext/ed25519/ref10/pow22523.h +++ b/src/ext/ed25519/ref10/pow22523.h @@ -1,3 +1,4 @@ +/* Modified by Tor: pointless loops removed to appease analysis tools */ /* qhasm: fe z1 */ @@ -50,7 +51,7 @@ /* qhasm: z2 = z1^2^1 */ /* asm 1: fe_sq(>z2=fe#1,<z1=fe#11); for (i = 1;i < 1;++i) fe_sq(>z2=fe#1,>z2=fe#1); */ /* asm 2: fe_sq(>z2=t0,<z1=z); for (i = 1;i < 1;++i) fe_sq(>z2=t0,>z2=t0); */ -fe_sq(t0,z); for (i = 1;i < 1;++i) fe_sq(t0,t0); +fe_sq(t0,z); /* DEADCODE This loop has no effect: for (i = 1;i < 1;++i) fe_sq(t0,t0); */ /* qhasm: z8 = z2^2^2 */ /* asm 1: fe_sq(>z8=fe#2,<z2=fe#1); for (i = 1;i < 2;++i) fe_sq(>z8=fe#2,>z8=fe#2); */ @@ -70,7 +71,7 @@ fe_mul(t0,t0,t1); /* qhasm: z22 = z11^2^1 */ /* asm 1: fe_sq(>z22=fe#1,<z11=fe#1); for (i = 1;i < 1;++i) fe_sq(>z22=fe#1,>z22=fe#1); */ /* asm 2: fe_sq(>z22=t0,<z11=t0); for (i = 1;i < 1;++i) fe_sq(>z22=t0,>z22=t0); */ -fe_sq(t0,t0); for (i = 1;i < 1;++i) fe_sq(t0,t0); +fe_sq(t0,t0); /* DEADCODE This loop has no effect: for (i = 1;i < 1;++i) fe_sq(t0,t0); */ /* qhasm: z_5_0 = z9*z22 */ /* asm 1: fe_mul(>z_5_0=fe#1,<z9=fe#2,<z22=fe#1); */ diff --git a/src/ext/ed25519/ref10/pow225521.h b/src/ext/ed25519/ref10/pow225521.h index 109df77..fe2af94 100644 --- a/src/ext/ed25519/ref10/pow225521.h +++ b/src/ext/ed25519/ref10/pow225521.h @@ -1,3 +1,4 @@ +/* Modified by Tor: pointless loops removed to appease analysis tools */ /* qhasm: fe z1 */ @@ -50,7 +51,7 @@ /* qhasm: z2 = z1^2^1 */ /* asm 1: fe_sq(>z2=fe#1,<z1=fe#11); for (i = 1;i < 1;++i) fe_sq(>z2=fe#1,>z2=fe#1); */ /* asm 2: fe_sq(>z2=t0,<z1=z); for (i = 1;i < 1;++i) fe_sq(>z2=t0,>z2=t0); */ -fe_sq(t0,z); for (i = 1;i < 1;++i) fe_sq(t0,t0); +fe_sq(t0,z); /* DEADCODE This loop has no effect: for (i = 1;i < 1;++i) fe_sq(t0,t0); */ /* qhasm: z8 = z2^2^2 */ /* asm 1: fe_sq(>z8=fe#2,<z2=fe#1); for (i = 1;i < 2;++i) fe_sq(>z8=fe#2,>z8=fe#2); */ @@ -70,7 +71,7 @@ fe_mul(t0,t0,t1); /* qhasm: z22 = z11^2^1 */ /* asm 1: fe_sq(>z22=fe#3,<z11=fe#1); for (i = 1;i < 1;++i) fe_sq(>z22=fe#3,>z22=fe#3); */ /* asm 2: fe_sq(>z22=t2,<z11=t0); for (i = 1;i < 1;++i) fe_sq(>z22=t2,>z22=t2); */ -fe_sq(t2,t0); for (i = 1;i < 1;++i) fe_sq(t2,t2); +fe_sq(t2,t0); /* DEADCODE This loop has no effect for (i = 1;i < 1;++i) fe_sq(t2,t2); */ /* qhasm: z_5_0 = z9*z22 */ /* asm 1: fe_mul(>z_5_0=fe#2,<z9=fe#2,<z22=fe#3); */

1 0

[trunnel/master] Stop emitting needless loops over fixed arrays of uint8_t
by nickm＠torproject.org 26 Sep '14

26 Sep '14

commit e4be3b4e1acd223f63add4b02d0072852cd620e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 26 08:59:05 2014 -0400 Stop emitting needless loops over fixed arrays of uint8_t Coverity says this code is stupid: for (idx = 0; idx < 32; ++idx) obj->hmac[idx] = (obj->hmac[idx]); And it's right! So let's stop generating it. Should fix Tor CID 1241499 --- lib/trunnel/CodeGen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 9d91394..392783b 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -2468,7 +2468,7 @@ class ParseFnGenerator(CodeGenerator): memcpy(obj->{c_name}, ptr, {multiplier}{width}); """, c_name=sfa.c_name, multiplier=multiplier, width=sfa.width, truncated=self.truncatedLabel) - if type(sfa.basetype) == trunnel.Grammar.IntType: + if type(sfa.basetype) == trunnel.Grammar.IntType and sfa.basetype.width > 8: self.format(""" {{ unsigned idx;

1 0

[tor/master] Fix a double-free in failing case of handle_control_authenticate.
by nickm＠torproject.org 26 Sep '14

26 Sep '14

commit 801f4d438460cd6eb0190fc18161ad499a95bc9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 18 11:13:57 2014 -0400 Fix a double-free in failing case of handle_control_authenticate. Bugfix on ed8f020e205267e6270494634346ab68d830e1d8; bug not in any released version of Tor. Found by Coverity; this is CID 1239290. [Yes, I used this commit message before, in 58e813d0fcfcecfc2017. Turns out, that fix wasn't right, since I didn't look up a screen. :P ] --- src/or/control.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/control.c b/src/or/control.c index b1709e0..92dd230 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1173,6 +1173,7 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len, bad_password = 1; SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); smartlist_free(sl); + sl = NULL; } else { SMARTLIST_FOREACH(sl, char *, expected, {

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 26 Sep '14

26 Sep '14

commit c7b1ba7a9f1ff2f49a4369e23de66b1305c67629 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 26 12:45:41 2014 +0000 Update translations for tor-launcher-network-settings_completed --- nl/network-settings.dtd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd index 56f990b..ee00a58 100644 --- a/nl/network-settings.dtd +++ b/nl/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nee"> <!ENTITY torSettings.firstQuestion "Welke van de volgende beschrijft het best jouw situatie?"> -<!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer wordt gecensureerd, gefilterd of geproxyed."> -<!ENTITY torSettings.configurePrompt2 "Ik moet bridge, firewall, of proxy instellingen wijzigen."> +<!ENTITY torSettings.configurePrompt1 "De internetverbinding van deze computer is gecensureerd of loopt via een proxy."> +<!ENTITY torSettings.configurePrompt2 "Ik moet bridge- of proxy instellingen configureren."> <!ENTITY torSettings.configure "Configureer"> <!ENTITY torSettings.connectPrompt2 "Ik zou graag rechtstreeks met het Tor netwerk verbinden."> <!ENTITY torSettings.connectPrompt3 "Dit zal in de meeste omstandigheden werken"> @@ -19,9 +19,6 @@  <!ENTITY torSettings.proxyHelp "Als je niet zeker bent over het antwoord op deze vraag, bekijk dan de verbindingsinstellingen van een andere browser om te zien of die is ingesteld om gebruik te maken van een proxy."> <!ENTITY torSettings.enterProxy "Voer de proxy-instellingen in."> -<!ENTITY torSettings.firewallQuestion "Loopt de internetverbinding van deze computer door een firewall die enkel toegang tot bepaalde poorten toestaat?"> -<!ENTITY torSettings.firewallHelp "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee. Als je op problemen botst tijdens het verbinden met het Tor netwerk, verander dan deze instelling."> -<!ENTITY torSettings.enterFirewall "Voer de poorten in die toegestaan zijn door de firewall, gescheiden door komma's."> <!ENTITY torSettings.bridgeQuestion "Doet je Internet Service Provider (ISP) het Tor netwerk verbieden of filteren?"> <!ENTITY torSettings.bridgeHelp "Als je niet zeker weet hoe je deze vraag moet beantwoorden, kies dan Nee.  Als je Ja kiest, moet je Tor bridges instellen, die doordat ze geen bekende relays zijn het dus moeilijker maken om verbinding te maken met het Tor Netwerk. "> <!ENTITY torSettings.bridgeSettingsPrompt "Je kunt de ingegeven bridges gebruiken, of je kunt een eigen bridge instellen. ">

1 0