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

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit 3b8cac7310c545bc4cd1b44acf5cade4822643f0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 14:46:32 2015 +0000 Update translations for tor-messenger-ircproperties --- sq/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sq/irc.properties b/sq/irc.properties index ed8b540..07d31e4 100644 --- a/sq/irc.properties +++ b/sq/irc.properties @@ -12,9 +12,9 @@ irc.usernameHint=pseudonim # These will show in the account manager if the account is # disconnected because of an error. connection.error.lost=Është humbur lidhja me shërbyesin. -connection.error.timeOut=Connection timed out -connection.error.invalidUsername=%S is not an allowed username -connection.error.invalidPassword=Invalid server password +connection.error.timeOut=Lidhjes i kaloi koha +connection.error.invalidUsername=%S nuk është një fjalëkalim i lejuar +connection.error.invalidPassword=Fjalëkalim i pavlefshëm shërbyesi connection.error.passwordRequired=Password required # LOCALIZATION NOTE (joinChat.*):

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit 1f7e617f9b787382cb9171d994ac0b429ef4d2fe Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 14:45:45 2015 +0000 Update translations for tails-misc_completed --- fr_CA.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 4db8d4c..af7f2c9 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-10 18:53+0200\n" -"PO-Revision-Date: 2015-08-21 10:13+0000\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-09-22 14:23+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -311,23 +311,23 @@ msgstr "Il semblerait que vous soyez bloqué du réseau. Ceci pourrait à voir a msgid "This version of Tails has known security issues:" msgstr "Cette version de Tails a des problèmes de sécurité connus :" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:45 #, sh-format msgid "Network card ${nic} disabled" msgstr "La carte réseau ${nic} est désactivée" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:46 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "L'usurpation de l'adresse MAC a échoué pour la carte réseau ${nic_name} (${nic}) donc elle a été temporairement désactivée.\nVous pourriez préférer redémarrer Tails et désactiver l'usurpation de l'adresse MAC. Voir la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:55 msgid "All networking disabled" msgstr "Tout le réseau est désactivé" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:56 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" @@ -473,8 +473,8 @@ msgid "I2P's router console is ready" msgstr "La console du routeur d'I2P est prête" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "Vous pouvez maintenant accéder à la console du routeur d'I2P à http://127.0.0.1:7657" +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Vous pouvez maintenant accéder à la console du routeur I2P dans le navigateur I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -482,10 +482,10 @@ msgstr "I2P n'est pas prêt" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "Le tunnel Eepsite n'a pas été construit en moins de six minutes. Vérifiez le console du routeur à http://127.0.0.1:7657/logs ou les journaux dans /var/log/i2p pour plus d'informations. Reconnectez-vous au réseau pour ressayer." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Le tunnel Eepsite n'a pas été construit en moins de six minutes. Vérifiez la console du routeur dans le navigateur I2P ou les journaux dans /var/log/i2p pour plus d'informations. Reconnectez-vous au réseau pour ressayer." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 22 Sep '15

22 Sep '15

commit ac5bb6f6afe9bb218257bf9dd7f6fa829a8f641d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 22 14:45:41 2015 +0000 Update translations for tails-misc --- bg.po | 7 ++++--- fr_CA.po | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bg.po b/bg.po index 3cee8b7..1eee8f3 100644 --- a/bg.po +++ b/bg.po @@ -7,6 +7,7 @@ # Gabriel Radev <gabosss(a)gmail.com>, 2015 # iliev.mb <iliev.mb(a)gmail.com>, 2015 # Ivaylo Markov <ivaylo.markov(a)openmailbox.org>, 2015 +# 4Joy <kiril.banialiev(a)gmail.com>, 2015 # alexdimitrov <kvikmen(a)gmail.com>, 2013 # Mal Malakov <dev(a)epsilon-labs.com>, 2015 # Tsvetan Nikolov <slakware(a)gmail.com>, 2015 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-09-22 14:44+0000\n" +"Last-Translator: 4Joy <kiril.banialiev(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -475,7 +476,7 @@ msgstr "Терминалът на I2P рутера е готов" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Вече имате достъп до I2P рутера на I2P браузера." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" diff --git a/fr_CA.po b/fr_CA.po index da20a8f..af7f2c9 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-20 19:32+0200\n" -"PO-Revision-Date: 2015-09-21 09:20+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2015-09-22 14:23+0000\n" +"Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -474,7 +474,7 @@ msgstr "La console du routeur d'I2P est prête" #: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 msgid "You can now access I2P's router console in the I2P Browser." -msgstr "" +msgstr "Vous pouvez maintenant accéder à la console du routeur I2P dans le navigateur I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -485,7 +485,7 @@ msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." -msgstr "" +msgstr "Le tunnel Eepsite n'a pas été construit en moins de six minutes. Vérifiez la console du routeur dans le navigateur I2P ou les journaux dans /var/log/i2p pour plus d'informations. Reconnectez-vous au réseau pour ressayer." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[tor-browser-bundle/master] We have no fix for 16909 in 5.5a3 yet
by gk＠torproject.org 22 Sep '15

22 Sep '15

commit a5d9b3dc621e521a106c869dde1057bc4cabadd1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 22 14:09:20 2015 +0000 We have no fix for 16909 in 5.5a3 yet --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cddf2d5..7c7b6b3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -36,7 +36,6 @@ Tor Browser 5.5a3 -- September 22 2015 * Linux * Bug 16672: Don't use font whitelisting for Linux users * Build system - * Bug 16909: Bump Ubuntu host requirement to 14.04+ * Bug 12240+12237: Make LXC builds reproducible Tor Browser 5.0.3 -- September 22 2015

1 0

[tor/master] scan-build is more mature now; no need to hardcode the one in my /opt/clang-3.4
by nickm＠torproject.org 22 Sep '15

22 Sep '15

commit 742514be2f4108953308d20d5967de590ba4100d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 22 09:58:16 2015 -0400 scan-build is more mature now; no need to hardcode the one in my /opt/clang-3.4 --- scripts/test/scan-build.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/test/scan-build.sh b/scripts/test/scan-build.sh index 2375ab6..56941f2 100644 --- a/scripts/test/scan-build.sh +++ b/scripts/test/scan-build.sh @@ -4,11 +4,8 @@ # # This script is used for running a bunch of clang scan-build checkers # on Tor. -# -# It has hardwired paths for Nick's desktop at the moment. CHECKERS="\ - --use-analyzer=/opt/clang-3.4/bin/clang \ -disable-checker deadcode.DeadStores \ -enable-checker alpha.core.CastSize \ -enable-checker alpha.core.CastToStruct \

1 0

[tor/master] Fix a memory leak in router_parse_addr_policy_item_from_string. CID 1324770
by nickm＠torproject.org 22 Sep '15

22 Sep '15

commit 6b6a714732e1bec58ee92b535902a5bbc5c7e946 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 22 09:55:05 2015 -0400 Fix a memory leak in router_parse_addr_policy_item_from_string. CID 1324770 --- src/or/routerparse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 17c46ac..f898ef8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3744,7 +3744,9 @@ router_parse_addr_policy_item_from_string,(const char *s, int assume_action, "exit policy. Ignoring, but continuing to parse rules. (Use " "accept/reject with IPv4 addresses.)", tok->n_args == 1 ? tok->args[0] : ""); - return NULL; + addr_policy_free(r); + r = NULL; + goto done; } goto done;

1 0

[tor/master] Merge branch 'feature16769_squashed'
by nickm＠torproject.org 22 Sep '15

22 Sep '15

commit df0b4f0342fc95f213cb5bb19a1f5260d546c1b6 Merge: e94ef30 8234fa0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 22 09:26:30 2015 -0400 Merge branch 'feature16769_squashed' changes/feature16769 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ src/or/or.h | 3 ++- src/or/routerkeys.c | 43 +++++++++++++++++++++++++++++++++++-------- src/or/routerkeys.h | 1 + 5 files changed, 71 insertions(+), 9 deletions(-) diff --cc src/or/routerkeys.c index b1e9ed3,197dbf8..765dac8 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@@ -273,8 -281,8 +285,9 @@@ ed_key_init_from_file(const char *fname const int encrypt_key = !! (flags & INIT_ED_KEY_TRY_ENCRYPTED); const int norepair = !! (flags & INIT_ED_KEY_NO_REPAIR); const int split = !! (flags & INIT_ED_KEY_SPLIT); - const int omit_secret = !! (flags & INIT_ED_KEY_OMIT_SECRET); + const int omit_secret = !! (flags & INIT_ED_KEY_OMIT_SECRET); + const int offline_secret = !! (flags & INIT_ED_KEY_OFFLINE_SECRET); + const int explicit_fname = !! (flags & INIT_ED_KEY_EXPLICIT_FNAME); /* we don't support setting both of these flags at once. */ tor_assert((flags & (INIT_ED_KEY_NO_REPAIR|INIT_ED_KEY_NEEDCERT)) != diff --cc src/or/routerkeys.h index b396779,f9eb777..0e1c625 --- a/src/or/routerkeys.h +++ b/src/or/routerkeys.h @@@ -17,7 -17,7 +17,8 @@@ #define INIT_ED_KEY_TRY_ENCRYPTED (1u<<8) #define INIT_ED_KEY_NO_REPAIR (1u<<9) #define INIT_ED_KEY_SUGGEST_KEYGEN (1u<<10) -#define INIT_ED_KEY_EXPLICIT_FNAME (1u<<11) +#define INIT_ED_KEY_OFFLINE_SECRET (1u<<11) ++#define INIT_ED_KEY_EXPLICIT_FNAME (1u<<12) struct tor_cert_st; ed25519_keypair_t *ed_key_init_from_file(const char *fname, uint32_t flags,

1 0

[tor/master] Add a new --newpass option to add or remove secret key passphrases.
by nickm＠torproject.org 22 Sep '15

22 Sep '15

commit d8f031aec2ee84c753ef282577c7f4fcf0123d2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 1 10:41:02 2015 -0400 Add a new --newpass option to add or remove secret key passphrases. --- changes/feature16769 | 3 +++ src/or/config.c | 10 ++++++++++ src/or/or.h | 1 + src/or/routerkeys.c | 23 ++++++++++++++++++----- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/changes/feature16769 b/changes/feature16769 new file mode 100644 index 0000000..62d373e --- /dev/null +++ b/changes/feature16769 @@ -0,0 +1,3 @@ + o Minor features (ed25519): + - Add a --newpass option to allow changing or removing the + passphrase of an encrypted key. \ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index 6e782de..b4a490c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1918,6 +1918,7 @@ static const struct { { "--dump-config", ARGUMENT_OPTIONAL }, { "--list-fingerprint", TAKES_NO_ARGUMENT }, { "--keygen", TAKES_NO_ARGUMENT }, + { "--newpass", TAKES_NO_ARGUMENT }, { "--no-passphrase", TAKES_NO_ARGUMENT }, { "--passphrase-fd", ARGUMENT_NECESSARY }, { "--verify-config", TAKES_NO_ARGUMENT }, @@ -4512,6 +4513,15 @@ options_init_from_torrc(int argc, char **argv) } } + if (config_line_find(cmdline_only_options, "--newpass")) { + if (command == CMD_KEYGEN) { + get_options_mutable()->change_key_passphrase = 1; + } else { + log_err(LD_CONFIG, "--newpass specified without --keygen!"); + exit(1); + } + } + { const config_line_t *fd_line = config_line_find(cmdline_only_options, "--passphrase-fd"); diff --git a/src/or/or.h b/src/or/or.h index 8c40f1a..0637325 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4302,6 +4302,7 @@ typedef struct { } keygen_force_passphrase; int use_keygen_passphrase_fd; int keygen_passphrase_fd; + int change_key_passphrase; } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 50659fc..be5c2c3 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -200,8 +200,17 @@ write_secret_key(const ed25519_secret_key_t *key, int encrypted, { if (encrypted) { int r = write_encrypted_secret_key(key, encrypted_fname); - if (r != 0) - return r; /* Either succeeded or failed unrecoverably */ + if (r == 1) { + /* Success! */ + + /* Try to unlink the unencrypted key, if any existed before */ + if (strcmp(fname, encrypted_fname)) + unlink(fname); + return r; + } else if (r != 0) { + /* Unrecoverable failure! */ + return r; + } fprintf(stderr, "Not encrypting the secret key.\n"); } @@ -432,7 +441,7 @@ ed_key_init_from_file(const char *fname, uint32_t flags, goto err; } - /* if it's absent, make a new keypair and save it. */ + /* if it's absent, make a new keypair... */ if (!have_secret && !found_public) { tor_free(keypair); keypair = ed_key_new(signing_key, flags, now, lifetime, @@ -441,8 +450,12 @@ ed_key_init_from_file(const char *fname, uint32_t flags, tor_log(severity, LD_OR, "Couldn't create keypair"); goto err; } - created_pk = created_sk = created_cert = 1; + } + + /* Write it to disk if we're supposed to do with a new passphrase, or if + * we just created it. */ + if (created_sk || (have_secret && get_options()->change_key_passphrase)) { if (write_secret_key(&keypair->seckey, encrypt_key, secret_fname, tag, encrypted_secret_fname) < 0 @@ -671,7 +684,7 @@ load_ed_keys(const or_options_t *options, time_t now) const int need_new_signing_key = NULL == use_signing || EXPIRES_SOON(check_signing_cert, 0) || - options->command == CMD_KEYGEN; + (options->command == CMD_KEYGEN && ! options->change_key_passphrase); const int want_new_signing_key = need_new_signing_key || EXPIRES_SOON(check_signing_cert, options->TestingSigningKeySlop);

1 0

[tor/master] Add a --master-key option
by nickm＠torproject.org 22 Sep '15

22 Sep '15

commit bca4211de5464cd159592b359b2f16eb64d3c07f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 1 10:58:53 2015 -0400 Add a --master-key option This lets the user override the default location for the master key when used with --keygen Part of 16769. --- changes/feature16769 | 6 +++++- src/or/config.c | 15 +++++++++++++++ src/or/or.h | 1 + src/or/routerkeys.c | 20 +++++++++++++++++--- src/or/routerkeys.h | 1 + 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/changes/feature16769 b/changes/feature16769 index 62d373e..49e9f35 100644 --- a/changes/feature16769 +++ b/changes/feature16769 @@ -1,3 +1,7 @@ o Minor features (ed25519): - Add a --newpass option to allow changing or removing the - passphrase of an encrypted key. \ No newline at end of file + passphrase of an encrypted key with tor --keygen. Implements + part of ticket 16769. + - Add a --master-key option to allow overriding the location of + the master key when running tor --keygen. Implements part of + ticket 16769. diff --git a/src/or/config.c b/src/or/config.c index b4a490c..d954316 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -762,6 +762,7 @@ or_options_free(or_options_t *options) } tor_free(options->BridgePassword_AuthDigest_); tor_free(options->command_arg); + tor_free(options->master_key_fname); config_free(&options_format, options); } @@ -1919,6 +1920,7 @@ static const struct { { "--list-fingerprint", TAKES_NO_ARGUMENT }, { "--keygen", TAKES_NO_ARGUMENT }, { "--newpass", TAKES_NO_ARGUMENT }, + { "--master-key", ARGUMENT_NECESSARY }, { "--no-passphrase", TAKES_NO_ARGUMENT }, { "--passphrase-fd", ARGUMENT_NECESSARY }, { "--verify-config", TAKES_NO_ARGUMENT }, @@ -4547,6 +4549,19 @@ options_init_from_torrc(int argc, char **argv) } } + { + const config_line_t *key_line = config_line_find(cmdline_only_options, + "--master-key"); + if (key_line) { + if (command != CMD_KEYGEN) { + log_err(LD_CONFIG, "--master-key without --keygen!"); + exit(1); + } else { + get_options_mutable()->master_key_fname = tor_strdup(key_line->value); + } + } + } + err: tor_free(cf); diff --git a/src/or/or.h b/src/or/or.h index 0637325..22c1eb2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4303,6 +4303,7 @@ typedef struct { int use_keygen_passphrase_fd; int keygen_passphrase_fd; int change_key_passphrase; + char *master_key_fname; } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index be5c2c3..197dbf8 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -258,6 +258,9 @@ write_secret_key(const ed25519_secret_key_t *key, int encrypted, * * If INIT_ED_KEY_SUGGEST_KEYGEN is set, have log messages about failures * refer to the --keygen option. + * + * If INIT_ED_KEY_EXPLICIT_FNAME is set, use the provided file name for the + * secret key file, encrypted or not. */ ed25519_keypair_t * ed_key_init_from_file(const char *fname, uint32_t flags, @@ -279,6 +282,7 @@ ed_key_init_from_file(const char *fname, uint32_t flags, const int norepair = !! (flags & INIT_ED_KEY_NO_REPAIR); const int split = !! (flags & INIT_ED_KEY_SPLIT); const int omit_secret = !! (flags & INIT_ED_KEY_OMIT_SECRET); + const int explicit_fname = !! (flags & INIT_ED_KEY_EXPLICIT_FNAME); /* we don't support setting both of these flags at once. */ tor_assert((flags & (INIT_ED_KEY_NO_REPAIR|INIT_ED_KEY_NEEDCERT)) != @@ -291,8 +295,13 @@ ed_key_init_from_file(const char *fname, uint32_t flags, char *got_tag = NULL; ed25519_keypair_t *keypair = tor_malloc_zero(sizeof(ed25519_keypair_t)); - tor_asprintf(&secret_fname, "%s_secret_key", fname); - tor_asprintf(&encrypted_secret_fname, "%s_secret_key_encrypted", fname); + if (explicit_fname) { + secret_fname = tor_strdup(fname); + encrypted_secret_fname = tor_strdup(fname); + } else { + tor_asprintf(&secret_fname, "%s_secret_key", fname); + tor_asprintf(&encrypted_secret_fname, "%s_secret_key_encrypted", fname); + } tor_asprintf(&public_fname, "%s_public_key", fname); tor_asprintf(&cert_fname, "%s_cert", fname); @@ -729,7 +738,12 @@ load_ed_keys(const or_options_t *options, time_t now) goto err; } tor_free(fname); - fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id"); + if (options->master_key_fname) { + fname = tor_strdup(options->master_key_fname); + flags |= INIT_ED_KEY_EXPLICIT_FNAME; + } else { + fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id"); + } id = ed_key_init_from_file( fname, flags, diff --git a/src/or/routerkeys.h b/src/or/routerkeys.h index b4e73aa..f9eb777 100644 --- a/src/or/routerkeys.h +++ b/src/or/routerkeys.h @@ -17,6 +17,7 @@ #define INIT_ED_KEY_TRY_ENCRYPTED (1u<<8) #define INIT_ED_KEY_NO_REPAIR (1u<<9) #define INIT_ED_KEY_SUGGEST_KEYGEN (1u<<10) +#define INIT_ED_KEY_EXPLICIT_FNAME (1u<<11) struct tor_cert_st; ed25519_keypair_t *ed_key_init_from_file(const char *fname, uint32_t flags,

1 0

[tor/master] Remove --master-key form the changes file
by nickm＠torproject.org 22 Sep '15

22 Sep '15

commit 8234fa00539cd6aa560c4fa1502a04e0f9e35a18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 22 09:22:09 2015 -0400 Remove --master-key form the changes file --- changes/feature16769 | 3 --- 1 file changed, 3 deletions(-) diff --git a/changes/feature16769 b/changes/feature16769 index 49e9f35..acb2b9c 100644 --- a/changes/feature16769 +++ b/changes/feature16769 @@ -2,6 +2,3 @@ - Add a --newpass option to allow changing or removing the passphrase of an encrypted key with tor --keygen. Implements part of ticket 16769. - - Add a --master-key option to allow overriding the location of - the master key when running tor --keygen. Implements part of - ticket 16769.

1 0