- tor-commits - lists.torproject.org

[tor/master] Log a better message when OfflineMasterKey is set.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 005a20ec859aa1c9e2f6d6bf5a1e70069f7f20f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 21 11:57:23 2016 -0400 Log a better message when OfflineMasterKey is set. Fixes bug 18133; bugfix on 0.2.7.2-alpha. --- changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug18133 b/changes/bug18133 new file mode 100644 index 0000000..177d286 --- /dev/null +++ b/changes/bug18133 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - When we can't generate a signing key because OfflineMasterKey is set, + do not imply that we should have been able to load it. + Fixes bug 18133; bugfix on 0.2.7.2-alpha. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index d88bfca..8006112 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -427,6 +427,10 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "but it was encrypted. Try 'tor --keygen' instead, so you " "can enter the passphrase.", secret_fname); + } else if (offline_secret) { + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + "but you're keeping it offline. (OfflineMasterKey is set.)", + secret_fname); } else { tor_log(severity, LD_OR, "We needed to load a secret key from %s, " "but couldn't find it. %s", secret_fname,

1 0

[tor/master] fix indentation
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 4093f343caa576a28269ecdff0c3025f081b058a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:16:21 2016 -0400 fix indentation --- src/or/routerkeys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 8006112..24ed31f 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -428,7 +428,7 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "can enter the passphrase.", secret_fname); } else if (offline_secret) { - tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " "but you're keeping it offline. (OfflineMasterKey is set.)", secret_fname); } else {

1 0

[tor/master] Merge branch 'bug18133_027' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit fdb57db581d4510b621fba087d9a7979934ea871 Merge: e247093 4093f34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:17:56 2016 -0400 Merge branch 'bug18133_027' into maint-0.2.8 changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.2.8] Log a better message when OfflineMasterKey is set.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 005a20ec859aa1c9e2f6d6bf5a1e70069f7f20f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 21 11:57:23 2016 -0400 Log a better message when OfflineMasterKey is set. Fixes bug 18133; bugfix on 0.2.7.2-alpha. --- changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug18133 b/changes/bug18133 new file mode 100644 index 0000000..177d286 --- /dev/null +++ b/changes/bug18133 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - When we can't generate a signing key because OfflineMasterKey is set, + do not imply that we should have been able to load it. + Fixes bug 18133; bugfix on 0.2.7.2-alpha. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index d88bfca..8006112 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -427,6 +427,10 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "but it was encrypted. Try 'tor --keygen' instead, so you " "can enter the passphrase.", secret_fname); + } else if (offline_secret) { + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + "but you're keeping it offline. (OfflineMasterKey is set.)", + secret_fname); } else { tor_log(severity, LD_OR, "We needed to load a secret key from %s, " "but couldn't find it. %s", secret_fname,

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 4b3e6c4d43b169c04b7fa34c1f2bb618b97151bf Merge: 9e57ffa fdb57db Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:18:03 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.2.8] fix indentation
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 4093f343caa576a28269ecdff0c3025f081b058a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:16:21 2016 -0400 fix indentation --- src/or/routerkeys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 8006112..24ed31f 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -428,7 +428,7 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "can enter the passphrase.", secret_fname); } else if (offline_secret) { - tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " "but you're keeping it offline. (OfflineMasterKey is set.)", secret_fname); } else {

1 0

[tor/release-0.2.8] Merge branch 'bug18133_027' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit fdb57db581d4510b621fba087d9a7979934ea871 Merge: e247093 4093f34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:17:56 2016 -0400 Merge branch 'bug18133_027' into maint-0.2.8 changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.2.8] Log a better message when OfflineMasterKey is set.
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 005a20ec859aa1c9e2f6d6bf5a1e70069f7f20f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 21 11:57:23 2016 -0400 Log a better message when OfflineMasterKey is set. Fixes bug 18133; bugfix on 0.2.7.2-alpha. --- changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug18133 b/changes/bug18133 new file mode 100644 index 0000000..177d286 --- /dev/null +++ b/changes/bug18133 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - When we can't generate a signing key because OfflineMasterKey is set, + do not imply that we should have been able to load it. + Fixes bug 18133; bugfix on 0.2.7.2-alpha. diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index d88bfca..8006112 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -427,6 +427,10 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "but it was encrypted. Try 'tor --keygen' instead, so you " "can enter the passphrase.", secret_fname); + } else if (offline_secret) { + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + "but you're keeping it offline. (OfflineMasterKey is set.)", + secret_fname); } else { tor_log(severity, LD_OR, "We needed to load a secret key from %s, " "but couldn't find it. %s", secret_fname,

1 0

[tor/maint-0.2.8] fix indentation
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit 4093f343caa576a28269ecdff0c3025f081b058a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:16:21 2016 -0400 fix indentation --- src/or/routerkeys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 8006112..24ed31f 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -428,7 +428,7 @@ ed_key_init_from_file(const char *fname, uint32_t flags, "can enter the passphrase.", secret_fname); } else if (offline_secret) { - tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " + tor_log(severity, LD_OR, "We wanted to load a secret key from %s, " "but you're keeping it offline. (OfflineMasterKey is set.)", secret_fname); } else {

1 0

[tor/maint-0.2.8] Merge branch 'bug18133_027' into maint-0.2.8
by nickm＠torproject.org 01 Apr '16

01 Apr '16

commit fdb57db581d4510b621fba087d9a7979934ea871 Merge: e247093 4093f34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 1 08:17:56 2016 -0400 Merge branch 'bug18133_027' into maint-0.2.8 changes/bug18133 | 4 ++++ src/or/routerkeys.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0