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

[tor/master] Actually, the tor --passphrase-fd is different from the tor-gencert one
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 869e5688b7856b0ceb8290a76a651a7f4306e926 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sat Jun 25 16:53:07 2016 +0200 Actually, the tor --passphrase-fd is different from the tor-gencert one --- doc/tor.1.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b2f5cfa..782c109 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -119,8 +119,10 @@ COMMAND-LINE OPTIONS user actually running the Tor daemon on your system. **--passphrase-fd** __FILEDES__:: - Filedescriptor to read the passphrase from. Ends at the first NUL or - newline. Default: read from the terminal. + Filedescriptor to read the passphrase from. Note that unlike with the + tor-gencert program, the entire file contents are read and used as + the passphrase, including any trailing newlines. + Default: read from the terminal. Other options can be specified on the command-line in the format "--option

1 0

[tor/master] Merge remote-tracking branch 'weasel/bug19504'
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 11ba7f00371ef3ed7b9fd353aad4e3e672239a40 Merge: ff5b10c 869e568 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 16:18:00 2016 -0400 Merge remote-tracking branch 'weasel/bug19504' changes/bug19504 | 3 +++ doc/tor.1.txt | 7 +++++++ 2 files changed, 10 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'weasel/bug19505'
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 560e976e4b3e330301704075bc6f9e1d5ccaa386 Merge: 2fb177e 135800f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 16:12:15 2016 -0400 Merge remote-tracking branch 'weasel/bug19505' changes/bug19505 | 5 +++++ doc/tor-gencert.1.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] tor-gencert.1: fix --passphrase-fd description
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 135800f75ce2b7d299b921acd9dbc5012b8787e0 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sat Jun 25 16:48:42 2016 +0200 tor-gencert.1: fix --passphrase-fd description --- changes/bug19505 | 5 +++++ doc/tor-gencert.1.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug19505 b/changes/bug19505 new file mode 100644 index 0000000..58f1ea0 --- /dev/null +++ b/changes/bug19505 @@ -0,0 +1,5 @@ + o Minor bugfixes (documentation): + - Fix the description of the --passphrase-fd option in the tor-gencert + manpage. The option is used to pass the number of a file descriptor to + read the passphrase from, not to read the file descriptor from. Fixes + bug 19505. diff --git a/doc/tor-gencert.1.txt b/doc/tor-gencert.1.txt index aa61ec3..6bba548 100644 --- a/doc/tor-gencert.1.txt +++ b/doc/tor-gencert.1.txt @@ -68,7 +68,7 @@ OPTIONS Number of months that the certificate should be valid. Default: 12. **--passphrase-fd** __FILEDES__:: - Filedescriptor to read the file descriptor from. Ends at the first NUL or + Filedescriptor to read the passphrase from. Ends at the first NUL or newline. Default: read from the terminal. **-a** __address__:__port__::

1 0

[tor/master] changes-on for 19505
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit ff5b10c9161f7ffd2fb2758241ff893b76c1807c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 16:17:17 2016 -0400 changes-on for 19505 --- changes/bug19505 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug19505 b/changes/bug19505 index 58f1ea0..47387b0 100644 --- a/changes/bug19505 +++ b/changes/bug19505 @@ -2,4 +2,4 @@ - Fix the description of the --passphrase-fd option in the tor-gencert manpage. The option is used to pass the number of a file descriptor to read the passphrase from, not to read the file descriptor from. Fixes - bug 19505. + bug 19505; bugfix on 0.2.0.20-alpha.

1 0

[tor/master] Fix a typo in the getting passphrase prompt for the ed25519 identity key
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 54c3066c72aed043f65c6e02c3c92015f8e4b465 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sat Jun 25 13:33:35 2016 +0200 Fix a typo in the getting passphrase prompt for the ed25519 identity key --- changes/bug19503 | 3 +++ src/or/routerkeys.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug19503 b/changes/bug19503 new file mode 100644 index 0000000..30afded --- /dev/null +++ b/changes/bug19503 @@ -0,0 +1,3 @@ + o Minor bugfixes (user interface): + - Fix a typo in the getting passphrase prompt for the ed25519 + identity key. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index fba3491..12de8c5 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -115,7 +115,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out, while (1) { ssize_t pwlen = - do_getpass("Enter pasphrase for master key:", pwbuf, sizeof(pwbuf), 0, + do_getpass("Enter passphrase for master key:", pwbuf, sizeof(pwbuf), 0, get_options()); if (pwlen < 0) { saved_errno = EINVAL;

1 0

[tor/master] Merge remote-tracking branch 'weasel/bug19503'
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 7602b0b31f8ba0d080f84bcb700db0100efcb26f Merge: 79b2ba8 54c3066 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 16:10:10 2016 -0400 Merge remote-tracking branch 'weasel/bug19503' changes/bug19503 | 3 +++ src/or/routerkeys.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] bugfix stanza in changes file for 19503
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 2fb177e8c98d1062a63d811b1bc4be35ff38f19f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 16:10:35 2016 -0400 bugfix stanza in changes file for 19503 --- changes/bug19503 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug19503 b/changes/bug19503 index 30afded..08fc801 100644 --- a/changes/bug19503 +++ b/changes/bug19503 @@ -1,3 +1,3 @@ o Minor bugfixes (user interface): - Fix a typo in the getting passphrase prompt for the ed25519 - identity key. + identity key. Fixes bug 19503; bugfix on 0.2.7.2-alpha.

1 0

[tor/master] Fix #19449 Remove --disable-transparent configure option
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit e607a2d9a0520df25f38f599d5e4a65b6d150f3f Author: U+039b <*(a)0x39b.fr> Date: Wed Jun 22 20:34:56 2016 +0200 Fix #19449 Remove --disable-transparent configure option --- configure.ac | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/configure.ac b/configure.ac index 6d721a2..81438fc 100644 --- a/configure.ac +++ b/configure.ac @@ -72,14 +72,6 @@ fi AM_CONDITIONAL(USE_OPENBSD_MALLOC, test "x$enable_openbsd_malloc" = "xyes") -AC_ARG_ENABLE(transparent, - AS_HELP_STRING(--disable-transparent, [disable transparent proxy support]), - [case "${enableval}" in - "yes") transparent=true ;; - "no") transparent=false ;; - *) AC_MSG_ERROR(bad value for --enable-transparent) ;; - esac], [transparent=true]) - AC_ARG_ENABLE(asciidoc, AS_HELP_STRING(--disable-asciidoc, [don't use asciidoc (disables building of manpages)]), [case "${enableval}" in @@ -1140,26 +1132,24 @@ AC_CHECK_HEADERS(linux/netfilter_ipv6/ip6_tables.h, #include <linux/if.h> #endif]) -if test "x$transparent" = "xtrue"; then - transparent_ok=0 - if test "x$net_if_found" = "x1" && test "x$net_pfvar_found" = "x1"; then - transparent_ok=1 - fi - if test "x$linux_netfilter_ipv4" = "x1"; then - transparent_ok=1 - fi - if test "x$linux_netfilter_ipv6_ip6_tables" = "x1"; then - transparent_ok=1 - fi - if test "x$transparent_ok" = "x1"; then - AC_DEFINE(USE_TRANSPARENT, 1, "Define to enable transparent proxy support") - case "$host" in - *-*-openbsd* | *-*-bitrig*) - AC_DEFINE(OPENBSD, 1, "Define to handle pf on OpenBSD properly") ;; - esac - else - AC_MSG_NOTICE([Transparent proxy support enabled, but missing headers.]) - fi +transparent_ok=0 +if test "x$net_if_found" = "x1" && test "x$net_pfvar_found" = "x1"; then + transparent_ok=1 +fi +if test "x$linux_netfilter_ipv4" = "x1"; then + transparent_ok=1 +fi +if test "x$linux_netfilter_ipv6_ip6_tables" = "x1"; then + transparent_ok=1 +fi +if test "x$transparent_ok" = "x1"; then + AC_DEFINE(USE_TRANSPARENT, 1, "Define to enable transparent proxy support") + case "$host" in + *-*-openbsd* | *-*-bitrig*) + AC_DEFINE(OPENBSD, 1, "Define to handle pf on OpenBSD properly") ;; + esac +else + AC_MSG_NOTICE([Transparent proxy support enabled, but missing headers.]) fi AC_CHECK_MEMBERS([struct timeval.tv_sec], , ,

1 0

[tor/master] changes file for 19449
by nickm＠torproject.org 29 Jun '16

29 Jun '16

commit 79b2ba85984aae5bb6832db97bdff682a27634cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 29 14:58:27 2016 -0400 changes file for 19449 --- changes/bug19449 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug19449 b/changes/bug19449 new file mode 100644 index 0000000..4592628 --- /dev/null +++ b/changes/bug19449 @@ -0,0 +1,4 @@ + o Removed features: + - There is no longer a compile-time option to disable support + for TransPort. (If you don't want TransPort; just don't use it.) + Patch from "U+039b". Closes ticket 19449.

1 0