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

[tor/master] Don't atoi off the end of a buffer chunk.
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit c4f2faf3019f2c41f9c3b2b8a73b4fe41e881328 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 09:39:46 2017 -0500 Don't atoi off the end of a buffer chunk. Fixes bug 20894; bugfix on 0.2.0.16-alpha. We already applied a workaround for this as 20834, so no need to freak out (unless you didn't apply 20384 yet). --- changes/bug20894 | 8 ++++++ src/common/util.c | 13 +++++++++ src/common/util.h | 1 + src/or/buffers.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- src/or/buffers.h | 5 ++++ src/test/test_buffers.c | 44 ++++++++++++++++++++++++++++++ src/test/test_util.c | 1 + 7 files changed, 131 insertions(+), 13 deletions(-) diff --git a/changes/bug20894 b/changes/bug20894 new file mode 100644 index 0000000..6443396 --- /dev/null +++ b/changes/bug20894 @@ -0,0 +1,8 @@ + o Major bugfixes (HTTP, parsing): + - When parsing a malformed content-length field from an HTTP message, + do not read off the end of the buffer. This bug was a potential + remote denial-of-service attack against Tor clients and relays. + A workaround was released in October 2016, which prevents this + bug from crashing Tor. This is a fix for the underlying issue, + which should no longer matter (if you applied the earlier patch). + Fixes bug 20894; bugfix on 0.2.0.16-alpha. diff --git a/src/common/util.c b/src/common/util.c index a7bce2e..9024dbf 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -712,6 +712,19 @@ tor_strisnonupper(const char *s) return 1; } +/** Return true iff every character in s is whitespace space; else + * return false. */ +int +tor_strisspace(const char *s) +{ + while (*s) { + if (!TOR_ISSPACE(*s)) + return 0; + s++; + } + return 1; +} + /** As strcmp, except that either string may be NULL. The NULL string is * considered to be before any non-NULL string. */ int diff --git a/src/common/util.h b/src/common/util.h index 479fc8d..6a743a6 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -186,6 +186,7 @@ void tor_strlower(char *s) ATTR_NONNULL((1)); void tor_strupper(char *s) ATTR_NONNULL((1)); int tor_strisprint(const char *s) ATTR_NONNULL((1)); int tor_strisnonupper(const char *s) ATTR_NONNULL((1)); +int tor_strisspace(const char *s); int strcmp_opt(const char *s1, const char *s2); int strcmpstart(const char *s1, const char *s2) ATTR_NONNULL((1,2)); int strcmp_len(const char *s1, const char *s2, size_t len) ATTR_NONNULL((1,2)); diff --git a/src/or/buffers.c b/src/or/buffers.c index 8981fd2..537a14a 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1090,6 +1090,52 @@ buf_find_string_offset(const buf_t *buf, const char *s, size_t n) return -1; } +/** + * Scan the HTTP headers in the headerlen-byte string at + * headers, looking for a "Content-Length" header. Try to set + * *result_out to the numeric value of that header if possible. + * Return -1 if the header was malformed, 0 if it was missing, and 1 if + * it was present and well-formed. + */ +/* STATIC */ int +buf_http_find_content_length(const char *headers, size_t headerlen, + size_t *result_out) +{ + const char *p, *newline; + char *len_str, *eos=NULL; + size_t remaining, result; + int ok; + *result_out = 0; /* The caller shouldn't look at this unless the + * return value is 1, but let's prevent confusion */ + +#define CONTENT_LENGTH "\r\nContent-Length: " + p = (char*) tor_memstr(headers, headerlen, CONTENT_LENGTH); + if (p == NULL) + return 0; + + tor_assert(p >= headers && p < headers+headerlen); + remaining = (headers+headerlen)-p; + p += strlen(CONTENT_LENGTH); + remaining -= strlen(CONTENT_LENGTH); + + newline = memchr(p, '\n', remaining); + if (newline == NULL) + return -1; + + len_str = tor_memdup_nulterm(p, newline-p); + /* We limit the size to INT_MAX because other parts of the buffer.c + * code don't like buffers to be any bigger than that. */ + result = (size_t) tor_parse_uint64(len_str, 10, 0, INT_MAX, &ok, &eos); + if (eos && !tor_strisspace(eos)) { + ok = 0; + } else { + *result_out = result; + } + tor_free(len_str); + + return ok ? 1 : -1; +} + /** There is a (possibly incomplete) http statement on buf, of the * form "\%s\\r\\n\\r\\n\%s", headers, body. (body may contain NULs.) * If a) the headers include a Content-Length field and all bytes in @@ -1115,9 +1161,10 @@ fetch_from_buf_http(buf_t *buf, char **body_out, size_t *body_used, size_t max_bodylen, int force_complete) { - char *headers, *p; - size_t headerlen, bodylen, contentlen; + char *headers; + size_t headerlen, bodylen, contentlen=0; int crlf_offset; + int r; check(); if (!buf->head) @@ -1153,17 +1200,12 @@ fetch_from_buf_http(buf_t *buf, return -1; } -#define CONTENT_LENGTH "\r\nContent-Length: " - p = (char*) tor_memstr(headers, headerlen, CONTENT_LENGTH); - if (p) { - int i; - i = atoi(p+strlen(CONTENT_LENGTH)); - if (i < 0) { - log_warn(LD_PROTOCOL, "Content-Length is less than zero; it looks like " - "someone is trying to crash us."); - return -1; - } - contentlen = i; + r = buf_http_find_content_length(headers, headerlen, &contentlen); + if (r == -1) { + log_warn(LD_PROTOCOL, "Content-Length is bogus; maybe " + "someone is trying to crash us."); + return -1; + } else if (r == 1) { /* if content-length is malformed, then our body length is 0. fine. */ log_debug(LD_HTTP,"Got a contentlen of %d.",(int)contentlen); if (bodylen < contentlen) { @@ -1176,7 +1218,11 @@ fetch_from_buf_http(buf_t *buf, bodylen = contentlen; log_debug(LD_HTTP,"bodylen reduced to %d.",(int)bodylen); } + } else { + tor_assert(r == 0); + /* Leave bodylen alone */ } + /* all happy. copy into the appropriate places, and return 1 */ if (headers_out) { *headers_out = tor_malloc(headerlen+1); diff --git a/src/or/buffers.h b/src/or/buffers.h index 52b21d5..9762cf2 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -97,5 +97,10 @@ struct buf_t { }; #endif +#ifdef BUFFERS_PRIVATE +int buf_http_find_content_length(const char *headers, size_t headerlen, + size_t *result_out); +#endif + #endif diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 3408da3..9e7bdb8 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -765,6 +765,49 @@ test_buffers_chunk_size(void *arg) ; } +static void +test_buffers_find_contentlen(void *arg) +{ + static const struct { + const char *headers; + int r; + int contentlen; + } results[] = { + { "Blah blah\r\nContent-Length: 1\r\n\r\n", 1, 1 }, + { "Blah blah\r\n\r\n", 0, 0 }, /* no content-len */ + { "Blah blah Content-Length: 1\r\n", 0, 0 }, /* no content-len. */ + { "Blah blah\r\nContent-Length: 100000\r\n", 1, 100000}, + { "Blah blah\r\nContent-Length: 1000000000000000000000000\r\n", -1, 0}, + { "Blah blah\r\nContent-Length: 0\r\n", 1, 0}, + { "Blah blah\r\nContent-Length: -1\r\n", -1, 0}, + { "Blah blah\r\nContent-Length: 1x\r\n", -1, 0}, + { "Blah blah\r\nContent-Length: 1 x\r\n", -1, 0}, + { "Blah blah\r\nContent-Length: 1 \r\n", 1, 1}, + { "Blah blah\r\nContent-Length: \r\n", -1, 0}, + { "Blah blah\r\nContent-Length: ", -1, 0}, + { "Blah blah\r\nContent-Length: 5050", -1, 0}, + { NULL, 0, 0 } + }; + int i; + + (void)arg; + + for (i = 0; results[i].headers; ++i) { + int r; + size_t sz; + size_t headerlen = strlen(results[i].headers); + char * tmp = tor_memdup(results[i].headers, headerlen);/* ensure no eos */ + sz = 999; /* to ensure it gets set */ + r = buf_http_find_content_length(tmp, headerlen, &sz); + tor_free(tmp); + log_debug(LD_DIR, "%d: %s", i, escaped(results[i].headers)); + tt_int_op(r, ==, results[i].r); + tt_int_op(sz, ==, results[i].contentlen); + } + done: + ; +} + struct testcase_t buffer_tests[] = { { "basic", test_buffers_basic, TT_FORK, NULL, NULL }, { "copy", test_buffer_copy, TT_FORK, NULL, NULL }, @@ -780,6 +823,7 @@ struct testcase_t buffer_tests[] = { { "tls_read_mocked", test_buffers_tls_read_mocked, 0, NULL, NULL }, { "chunk_size", test_buffers_chunk_size, 0, NULL, NULL }, + { "find_contentlen", test_buffers_find_contentlen, 0, NULL, NULL }, END_OF_TESTCASES }; diff --git a/src/test/test_util.c b/src/test/test_util.c index fcda564..dc01d1a 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -9,6 +9,7 @@ #define CONTROL_PRIVATE #define UTIL_PRIVATE #include "or.h" +#include "buffers.h" #include "config.h" #include "control.h" #include "test.h"

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket20656_030_01'
by nickm＠torproject.org 15 Feb '17

15 Feb '17

commit dec7dc3d823a8a9cc1d9d75d1b803a6e6b308a8e Merge: 7e469c1 3f005c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 14 19:15:10 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket20656_030_01' changes/ticket20656 | 3 +++ src/or/protover.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Don't show detailed build logs on stdout
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit 36a1538a2d119aac1e2f7b3ce21260d0258ccc88 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 15 00:11:07 2017 +0100 Don't show detailed build logs on stdout To provide a more "high level" view of progress, don't output build logs of each componets on stdout, but write them in files in the logs/ directory. This idea was suggested by mcs and Kathy in this comment: https://trac.torproject.org/projects/tor/ticket/17379#comment:12 --- .gitignore | 1 + rbm | 2 +- rbm.conf | 1 + rbm.local.conf.example | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 98554a3..e38b069 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ alpha_nightly nightly hardened rbm.local.conf +logs diff --git a/rbm b/rbm index 3fdeb23..b0382cc 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 3fdeb23bc4ab4dc65e69ff0fac49db603c4efb08 +Subproject commit b0382ccc58b9286e066bf5980f80cf041e287067 diff --git a/rbm.conf b/rbm.conf index 47ffbfb..802bb48 100644 --- a/rbm.conf +++ b/rbm.conf @@ -2,6 +2,7 @@ debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" +build_log: 'logs/[% project %]-[% c("var/osname") %].log' pkg_type: build diff --git a/rbm.local.conf.example b/rbm.local.conf.example index 20f081f..ac54935 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -22,6 +22,11 @@ ### use the same docker image names. #docker_image_prefix: tor-browser_XXXXX +### The build_log option defines in which file the build logs of each +### component are stored. If you set it to '-' the logs are output on +### stdout and stderr. +#build_log: '-' + var: local_conf: 1

1 0

[rbm/master] Add the build_log option
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit b0382ccc58b9286e066bf5980f80cf041e287067 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 23:55:10 2017 +0100 Add the build_log option --- NEWS | 2 ++ doc/rbm_cli.asc | 4 ++++ doc/rbm_config.asc | 4 ++++ lib/RBM.pm | 24 ++++++++++++++++++++++-- lib/RBM/DefaultConfig.pm | 1 + rbm | 2 +- 6 files changed, 34 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 1a1789f..663a281 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- Add the build_log option + - Add support for optional local configuration file rbm.local.conf - add the git_submodule option diff --git a/doc/rbm_cli.asc b/doc/rbm_cli.asc index 66f6025..adb8b27 100644 --- a/doc/rbm_cli.asc +++ b/doc/rbm_cli.asc @@ -42,6 +42,10 @@ The following options can be set on the command line : --output-dir=<directory>:: Set the output directory + --build-log=<filename>:: + Set the file where the build logs will be written. If the value is `-` + (the default), the logs will be output on stdout and stderr. + --version=<version>:: Set the package version diff --git a/doc/rbm_config.asc b/doc/rbm_config.asc index e8decd9..a461b3d 100644 --- a/doc/rbm_config.asc +++ b/doc/rbm_config.asc @@ -140,6 +140,10 @@ output_dir:: The directory where output files (tarballs, spec files or packages) are created. The default value is +out+. +build_log:: + The file where the build logs will be written. If the value is `-` (the + default), the logs will be output on stdout and stderr. + fetch:: The value should be 0 or 1, depending on whether the commits from the remote git or hg repository should be fetched diff --git a/lib/RBM.pm b/lib/RBM.pm index 4b5bfe9..2248b41 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -884,6 +884,18 @@ sub input_files { return \%res_getfnames if $action eq 'getfnames'; } +sub system_log { + my ($log_file, @args) = @_; + return system(@args) if $log_file eq '-'; + if (my $pid = fork) { + waitpid($pid, 0); + return ${^CHILD_ERROR_NATIVE}; + } + exit_error "Could not open $log_file" unless open(STDOUT, '>>', $log_file); + open(STDERR, '>&', *STDOUT); + exec(@args); +} + sub build_run { my ($project, $script_name, $options) = @_; my $old_step = $config->{step}; @@ -959,6 +971,14 @@ sub build_run { write_file("$srcdir/$s", $build_script{$s}); chmod 0700, "$srcdir/$s"; } + my $build_log = project_config($project, "build_log", $options); + if ($build_log ne '-') { + $build_log = path($build_log); + make_path(dirname($build_log)); + my $now = localtime; + write_file($build_log, {append => 1}, "Starting build: $now\n"); + print "Build log: $build_log\n"; + } chdir $srcdir; my $res; if ($remote_tmp_src && $remote_tmp_dst) { @@ -982,7 +1002,7 @@ sub build_run { exec_name => $s, exec_as_root => $scripts_root{$s}, }); - if (run_script($project, $cmd, sub { system(@_) }) != 0) { + if (run_script($project, $cmd, sub { system_log($build_log, @_) }) != 0) { $error = "Error running $script_name"; if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n"; @@ -1019,7 +1039,7 @@ sub build_run { foreach my $s (@scripts) { my $cmd = $scripts_root{$s} ? project_config($project, 'suexec', { suexec_cmd => "$srcdir/$s" }) : "$srcdir/$s"; - if (system($cmd) != 0) { + if (system_log($build_log, $cmd) != 0) { $error = "Error running $script_name"; if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n"; diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index aad9451..ec03ff0 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -112,6 +112,7 @@ our %default_config = ( fetch => 'if_needed', rpmspec => '[% SET tmpl = project _ ".spec"; INCLUDE $tmpl -%]', build => '[% INCLUDE build -%]', + build_log => '-', notmpl => [ qw(projects_dir) ], describe => \&git_describe, abbrev_lenght => '12', diff --git a/rbm b/rbm index c618ada..050cff5 100755 --- a/rbm +++ b/rbm @@ -95,7 +95,7 @@ sub set_options { gpg-keyring=s gpg-keyring-dir=s gpg-args=s gpg-bin=s sysconf-file=s debsign-keyid=s use-pbuilder! step=s target=s@ publish-src-dir=s debug! hg-clone-dir=s - hg-hash=s localconf-file=s); + hg-hash=s localconf-file=s build-log=s); my %val; Getopt::Long::GetOptionsFromArray(\@_, \%val, @options) || exit 1; foreach my $k (keys %val) {

1 0

[tor-browser-build/master] projects/meek: only include *.1 files from doc directory
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit fc068986a71b27e896c9a727754bbd09dcf64a8c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 18:02:55 2017 +0100 projects/meek: only include *.1 files from doc directory --- projects/meek/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/meek/build b/projects/meek/build index d195e90..283066a 100644 --- a/projects/meek/build +++ b/projects/meek/build @@ -34,7 +34,7 @@ cp -a meek-client-torbrowser[% IF c("var/windows") %].exe[% END %] $PTDIR [% END %] cd .. -cp -a README doc/* $DOCSDIR +cp -a README doc/*.1 $DOCSDIR cd firefox [% c('zip', {

1 0

[tor-browser-build/master] projects/tor-browser: add missing TORCONFIGPATH var on Linux/Windows
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit 55b71bbf54bb402918b4b102894f0c7a09cf68c7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 17:54:13 2017 +0100 projects/tor-browser: add missing TORCONFIGPATH var on Linux/Windows --- projects/tor-browser/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index e25a1d8..d19b6b7 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -34,6 +34,7 @@ TB_STAGE_DIR=$distdir/tor-browser-stage DOCSPATH=TorBrowser/Docs EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions + TORCONFIGPATH=TorBrowser/Data/Tor EXTOVERRIDESPATH=TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper

1 0

[tor-browser-build/master] projects/tor-browser: fix Docs path
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit 0e1862403ebef5f91e3a2f2e3253baf74a339621 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 18:21:35 2017 +0100 projects/tor-browser: fix Docs path --- projects/tor-browser/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index d19b6b7..caf0cf4 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -105,7 +105,8 @@ tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -xf [% c('input_files_b tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %] -cp -a Bundle-Data/Docs $TBDIR/$DOCSPATH +mkdir -p $TBDIR/$DOCSPATH +cp -a Bundle-Data/Docs/* $TBDIR/$DOCSPATH tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults

1 0

[metrics-base/master] Remove import of non-existing css. Spotted by Karsten.
by karsten＠torproject.org 14 Feb '17

14 Feb '17

commit 34e703de0663a09c565d759c42c4a146a5aac935 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jan 3 19:28:53 2017 +0000 Remove import of non-existing css. Spotted by Karsten. --- java/stylesheet.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/java/stylesheet.css b/java/stylesheet.css index 31bc89f..1e18e9e 100644 --- a/java/stylesheet.css +++ b/java/stylesheet.css @@ -3,8 +3,6 @@ Overall document style */ -@import url('resources/fonts/dejavu.css'); - body { background-color:#ffffff; color:#353833;

1 0

[metrics-base/master] Add new style to metrics-base. Implements task-21376.
by karsten＠torproject.org 14 Feb '17

14 Feb '17

commit fb2b1171b1242be4d86d4c7604a498502a0fef81 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jan 3 19:28:52 2017 +0000 Add new style to metrics-base. Implements task-21376. --- java/base.xml | 4 + java/stylesheet.css | 611 ++++++++++++++++++++++++++++++++++++++++++++++++++++ java/tor-onion.png | Bin 0 -> 5585 bytes 3 files changed, 615 insertions(+) diff --git a/java/base.xml b/java/base.xml index 47540e0..4152cbc 100644 --- a/java/base.xml +++ b/java/base.xml @@ -28,6 +28,8 @@ value="${dist}/${name}-${release.version}.tar.gz" /> <property file="build.properties" /> <property name="emptymanifest" value="${generated}/emptymanifest" /> + <property name="javadocstyle" value="${basedir}/src/build/java/stylesheet.css" /> + <property name="javadocicon" value="${basedir}/src/build/java/tor-onion.png" />  <path id="classpath"> @@ -156,6 +158,7 @@ timezone="UTC" /> </tstamp> <javadoc destdir="${docs}" + stylesheetfile="${javadocstyle}" footer="&copy; ${copyyear} The Tor Project" doctitle="${javadoc-title}" overview="${basedir}/${resources}/overview.html" @@ -166,6 +169,7 @@ <exclude name="${javadoc-excludes}"/> </fileset> </javadoc> + <copy file="${javadocicon}" todir="${docs}"/> </target> <target name="test" depends="compile,testcompile"> diff --git a/java/stylesheet.css b/java/stylesheet.css new file mode 100644 index 0000000..31bc89f --- /dev/null +++ b/java/stylesheet.css @@ -0,0 +1,611 @@ +/* Javadoc style sheet */ +/* +Overall document style +*/ + +@import url('resources/fonts/dejavu.css'); + +body { + background-color:#ffffff; + color:#353833; + font-family:'DejaVu Sans', Arial, Helvetica, sans-serif; + font-size:16px; + line-height:1.2em; + margin:0; +} +a:link, a:visited { + text-decoration:none; + color:#68b030; +} +a:hover, a:focus { + text-decoration:none; + color:#68b030; + text-decoration:underline; +} +a:active { + text-decoration:none; + color:#68b030; +} +a[name] { + color:#353833; +} +a[name]:hover { + text-decoration:none; + color:#353833; +} +pre { + font-family:'DejaVu Sans Mono', monospace; + font-size:16px; +} +h1 { + font-size:22px; +} +h2 { + font-size:20px; +} +h3 { + font-size:18px; + font-style:italic; +} +h4 { + font-size:15px; +} +h5 { + font-size:14px; +} +h6 { + font-size:13px; +} +ul { + list-style-type:disc; +} +code, tt { + font-family:'DejaVu Sans Mono', monospace; + font-size:16px; + padding-top:4px; + margin-top:8px; + line-height:1.4em; +} +dt code { + font-family:'DejaVu Sans Mono', monospace; + font-size:16px; + padding-top:4px; +} +table tr td dt code { + font-family:'DejaVu Sans Mono', monospace; + font-size:16px; + vertical-align:top; + padding-top:4px; +} +sup { + font-size:9px; +} +/* +Document title and Copyright styles +*/ +.clear { + clear:both; + height:0px; + overflow:hidden; +} +.aboutLanguage { + float:right; + padding:13px 50px; + font-size:13px; + z-index:200; + margin-top:-9px; +} +.legalCopy { + margin-left:.5em; +} +.bar a, .bar a:link, .bar a:visited, .bar a:active { + color:#FFFFFF; + text-decoration:none; +} +.bar a:hover, .bar a:focus { + color:#bb7a2a; +} +.tab { + background-color:#0066FF; + color:#ffffff; + padding:8px; + width:5em; + font-weight:bold; +} +/* +Navigation bar styles +*/ +.bar { + background-color:#7d4698; + color:#FFFFFF; + padding:.8em .5em .4em .8em; + height:auto;/*height:1.8em;*/ + font-size:13px; + margin:0; +} +.topNav { + background-color:#7d4698; + color:#FFFFFF; + float:left; + width:100%; + clear:right; + height:2.8em; + overflow:hidden; + font-size:14px; + padding:10px 0 10px 5px; + box-sizing: border-box; + min-height:50px; + background-repeat: no-repeat; + background-image: url(tor-onion.png); + background-position: right 10px bottom -25px; +} +.bottomNav { + margin-top:10px; + background-color:#7d4698; + color:#FFFFFF; + float:left; + width:100%; + clear:right; + height:2.8em; + padding-top:10px; + overflow:hidden; + font-size:14px; + padding:10px 0 10px 5px; + box-sizing: border-box; + min-height:50px; + background-repeat: no-repeat; + background-image: url(tor-onion.png); + background-position: right 10px bottom -25px; +} +.subNav { + background-color:#e7e7e7; + float:left; + width:100%; + overflow:hidden; + font-size:14px; + background-repeat: no-repeat; + background-image: url(tor-onion.png); + background-position: right 10px top -41px; +} +.subNav div { + clear:left; + float:left; + padding:0 0 5px 6px; + text-transform:uppercase; +} +ul.navList, ul.subNavList { + float:left; + margin:0 25px 0 0; + padding:0; +} +ul.navList li{ + list-style:none; + float:left; + padding: 5px 6px; + text-transform:uppercase; +} +ul.subNavList li{ + list-style:none; + float:left; +} +.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { + color:#FFFFFF; + text-decoration:none; + text-transform:uppercase; +} +.topNav a:hover, .bottomNav a:hover { + text-decoration:none; + color:#fff; + text-transform:uppercase; +} +.navBarCell1Rev { + background-color:rgba(0,0,0,0.2); + color:#fff; + margin: auto 5px; +} +.skipNav { + position:absolute; + top:auto; + left:-9999px; + overflow:hidden; +} +/* +Page header and footer styles +*/ +.header, .footer { + clear:both; + margin:0 20px; + padding:5px 0 0 0; +} +.indexHeader { + margin:10px; + position:relative; +} +.indexHeader span{ + margin-right:15px; +} +.indexHeader h1 { + font-size:15px; +} +.title { + color:#2c4557; + margin:10px 0; +} +.subTitle { + margin:5px 0 0 0; +} +.header ul { + margin:0 0 15px 0; + padding:0; +} +.footer ul { + margin:20px 0 5px 0; +} +.header ul li, .footer ul li { + list-style:none; + font-size:15px; +} +/* +Heading styles +*/ +div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { + background-color:#e7e7e7; + border:1px solid #d0d9e0; + margin:0 0 6px -8px; + padding:7px 5px; +} +ul.blockList ul.blockList ul.blockList li.blockList h3 { + background-color:#e7e7e7; + border:1px solid #d0d9e0; + margin:0 0 6px -8px; + padding:7px 5px; +} +ul.blockList ul.blockList li.blockList h3 { + padding:0; + margin:15px 0; +} +ul.blockList li.blockList h2 { + padding:0px 0 20px 0; +} +/* +Page layout container styles +*/ +.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { + clear:both; + padding:10px 20px; + position:relative; +} +.indexContainer { + margin:10px; + position:relative; + font-size:14px; +} +.indexContainer h2 { + font-size:15px; + padding:0 0 3px 0; +} +.indexContainer ul { + margin:0; + padding:0; +} +.indexContainer ul li { + list-style:none; + padding-top:2px; +} +.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { + font-size:14px; + font-weight:bold; + margin:10px 0 0 0; + color:#4E4E4E; +} +.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { + margin:5px 0 10px 0px; + font-size:14px; + font-family:'DejaVu Sans Mono',monospace; +} +.serializedFormContainer dl.nameValue dt { + margin-left:1px; + font-size:1.1em; + display:inline; + font-weight:bold; +} +.serializedFormContainer dl.nameValue dd { + margin:0 0 0 1px; + font-size:1.1em; + display:inline; +} +/* +List styles +*/ +ul.horizontal li { + display:inline; + font-size:0.9em; +} +ul.inheritance { + margin:0; + padding:0; +} +ul.inheritance li { + display:inline; + list-style:none; +} +ul.inheritance li ul.inheritance { + margin-left:15px; + padding-left:15px; + padding-top:1px; +} +ul.blockList, ul.blockListLast { + margin:10px 0 10px 0; + padding:0; +} +ul.blockList li.blockList, ul.blockListLast li.blockList { + list-style:none; + margin-bottom:15px; + line-height:1.4; +} +ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { + padding:0px 20px 5px 10px; + border:1px solid #ededed; + background-color:#f8f8f8; +} +ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { + padding:0 0 5px 8px; + background-color:#ffffff; + border:none; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { + margin-left:0; + padding-left:0; + padding-bottom:15px; + border:none; +} +ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { + list-style:none; + border-bottom:none; + padding-bottom:0; +} +table tr td dl, table tr td dl dt, table tr td dl dd { + margin-top:0; + margin-bottom:1px; +} +/* +Table styles +*/ +.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary { + width:100%; + border-left:1px solid #EEE; + border-right:1px solid #EEE; + border-bottom:1px solid #EEE; +} +.overviewSummary, .memberSummary { + padding:0px; +} +.overviewSummary caption, .memberSummary caption, .typeSummary caption, +.useSummary caption, .constantsSummary caption, .deprecatedSummary caption { + position:relative; + text-align:left; + background-repeat:no-repeat; + color:#253441; + font-weight:bold; + clear:none; + overflow:hidden; + padding:0px; + padding-top:10px; + padding-left:1px; + margin:0px; + white-space:pre; +} +.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link, +.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link, +.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover, +.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover, +.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active, +.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active, +.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited, +.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited { + color:#FFFFFF; +} +.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span, +.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + padding-bottom:7px; + display:inline-block; + float:left; + background-color:#7d4698; + color:white; + font-weight:normal; + border: none; + height:16px; +} +.memberSummary caption span.tableTab span, .memberSummary caption span.activeTableTab span { + border-top-left-radius: 5px; + border-top-right-radius: 5px; + border:1px solid #ddd; + border-bottom:0; +} +.memberSummary caption span.activeTableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + padding-bottom:10px; + margin-right:3px; + display:inline-block; + float:left; + background-color:#7d4698; + color:white; + font-weight:normal; + height:16px; + border-color:#7d4698; +} +.memberSummary caption span.tableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + padding-bottom:10px; + margin-right:3px; + display:inline-block; + float:left; + background-color:#fff; + height:16px; +} +.memberSummary caption span.tableTab span a { + color:#68b030; + font-weight:normal; +} +.memberSummary caption span.tableTab span:hover { + background-color:#eee; +} +.memberSummary caption span.tableTab span a:hover { + text-decoration:none; +} +.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab { + padding-top:0px; + padding-left:0px; + padding-right:0px; + background-image:none; + float:none; + display:inline; +} +.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, +.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd { + display:none; + width:5px; + position:relative; + float:left; + background-color:rgba(0,0,0,0.2); +} +.memberSummary .activeTableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + float:left; + background-color:rgba(0,0,0,0.2); +} +.memberSummary .tableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + background-color:#7d4698; + float:left; + +} +.overviewSummary td, .memberSummary td, .typeSummary td, +.useSummary td, .constantsSummary td, .deprecatedSummary td { + text-align:left; + padding:0px 0px 12px 10px; +} +th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th, +td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{ + vertical-align:top; + padding-right:0px; + padding-top:8px; + padding-bottom:3px; +} +th.colFirst, th.colLast, th.colOne, .constantsSummary th { + background:#e7e7e7; + text-align:left; + padding:8px 3px 3px 7px; +} +td.colFirst, th.colFirst { + white-space:nowrap; + font-size:13px; +} +td.colLast, th.colLast { + font-size:13px; +} +td.colOne, th.colOne { + font-size:13px; +} +.overviewSummary td.colFirst, .overviewSummary th.colFirst, +.useSummary td.colFirst, .useSummary th.colFirst, +.overviewSummary td.colOne, .overviewSummary th.colOne, +.memberSummary td.colFirst, .memberSummary th.colFirst, +.memberSummary td.colOne, .memberSummary th.colOne, +.typeSummary td.colFirst{ + width:25%; + vertical-align:top; +} +td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { + font-weight:bold; +} +.tableSubHeadingColor { + background-color:#EEEEFF; +} +.altColor { + background-color:#FFFFFF; +} +.rowColor { + background-color:#EEEEEF; +} +/* +Content styles +*/ +.description pre { + margin-top:0; +} +.deprecatedContent { + margin:0; + padding:10px 0; +} +.docSummary { + padding:0; +} + +ul.blockList ul.blockList ul.blockList li.blockList h3 { + font-style:normal; +} + +div.block { + font-size:14px; + /* font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; */ +} + +td.colLast div { + padding-top:0px; +} + + +td.colLast a { + padding-bottom:3px; +} +/* +Formatting effect styles +*/ +.sourceLineNo { + color:green; + padding:0 30px 0 0; +} +h1.hidden { + visibility:hidden; + overflow:hidden; + font-size:10px; +} +.block { + display:block; + margin:3px 10px 2px 0px; + color:#474747; +} +.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, +.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, +.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink { + font-weight:bold; +} +.deprecationComment, .emphasizedPhrase, .interfaceName { + font-style:italic; +} + +div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase, +div.block div.block span.interfaceName { + font-style:normal; +} + +div.contentContainer ul.blockList li.blockList h2{ + padding-bottom:0px; +} diff --git a/java/tor-onion.png b/java/tor-onion.png new file mode 100644 index 0000000..8b34db2 Binary files /dev/null and b/java/tor-onion.png differ

1 0

[tor-browser-build/master] Update rbm: set timestamp on files in zip wrapper
by boklm＠torproject.org 14 Feb '17

14 Feb '17

commit e45112bd7ce3a59fc57c42432ce8ec4d23d176e8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 14 16:00:14 2017 +0100 Update rbm: set timestamp on files in zip wrapper --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a57b484..3fdeb23 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a57b4846c8aba5697ce1f197996e2962ffb5b534 +Subproject commit 3fdeb23bc4ab4dc65e69ff0fac49db603c4efb08

1 0