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

[tor/master] Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit fdaa483098d723b4be24a4e861c4280a67a3d4b0 Merge: 7e4ac0283 17f922d37 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 19:56:23 2018 -0400 Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged Makefile.am | 8 + changes/feature26815 | 3 + changes/feature26816 | 11 + config.rust.in | 2 + configure.ac | 22 + src/app/include.am | 8 +- src/core/crypto/onion_ntor.c | 2 +- src/core/crypto/relay_crypto.c | 2 +- src/core/mainloop/main.c | 1 + src/core/or/or.h | 3 +- src/ext/tinytest.c | 8 + src/feature/nodelist/parsecommon.c | 2 +- src/feature/relay/router.c | 1 + src/feature/rend/rendmid.c | 2 +- src/lib/crypt_ops/aes_nss.c | 106 +++++ src/lib/crypt_ops/{aes.c => aes_openssl.c} | 4 +- src/lib/crypt_ops/crypto.c | 509 ------------------------ src/lib/crypt_ops/crypto_cipher.c | 190 +++++++++ src/lib/crypt_ops/{crypto.h => crypto_cipher.h} | 25 +- src/lib/crypt_ops/crypto_dh.c | 484 ++-------------------- src/lib/crypt_ops/crypto_dh.h | 23 +- src/lib/crypt_ops/crypto_dh_nss.c | 207 ++++++++++ src/lib/crypt_ops/crypto_dh_openssl.c | 471 ++++++++++++++++++++++ src/lib/crypt_ops/crypto_digest.c | 258 +++++++++++- src/lib/crypt_ops/crypto_digest.h | 3 + src/lib/crypt_ops/crypto_init.c | 141 +++++++ src/lib/crypt_ops/crypto_init.h | 29 ++ src/lib/crypt_ops/crypto_nss_mgt.c | 102 +++++ src/lib/crypt_ops/crypto_nss_mgt.h | 33 ++ src/lib/crypt_ops/crypto_openssl_mgt.c | 228 ++++++++++- src/lib/crypt_ops/crypto_openssl_mgt.h | 15 +- src/lib/crypt_ops/crypto_pwbox.c | 2 +- src/lib/crypt_ops/crypto_rand.c | 110 ++++- src/lib/crypt_ops/crypto_rsa.c | 48 ++- src/lib/crypt_ops/crypto_rsa.h | 5 + src/lib/crypt_ops/crypto_s2k.c | 2 +- src/lib/crypt_ops/crypto_util.c | 23 -- src/lib/crypt_ops/crypto_util.h | 9 - src/lib/crypt_ops/include.am | 29 +- src/lib/include.libdonna.am | 2 +- src/lib/tls/include.am | 5 +- src/lib/tls/tortls.c | 8 +- src/rust/build.rs | 1 + src/test/bench.c | 6 +- src/test/fuzz/fuzzing_common.c | 15 +- src/test/fuzz/include.am | 4 +- src/test/include.am | 22 +- src/test/test-timers.c | 5 + src/test/test_crypto.c | 57 +++ src/test/test_hs_client.c | 2 +- src/test/test_hs_ntor_cl.c | 7 +- src/test/test_introduce.c | 2 +- src/test/test_ntor_cl.c | 8 +- src/test/test_relaycell.c | 2 +- src/test/test_routerkeys.c | 2 +- src/test/test_util_slow.c | 2 +- src/test/test_workqueue.c | 1 + src/test/testing_common.c | 9 +- src/tools/include.am | 10 +- src/tools/tor-gencert.c | 14 +- 60 files changed, 2208 insertions(+), 1107 deletions(-) diff --cc Makefile.am index 3df35ad3f,01ed8c935..adf02122f --- a/Makefile.am +++ b/Makefile.am @@@ -131,8 -126,15 +131,16 @@@ TOR_INTERNAL_TESTING_LIBS = $(TOR_UTIL_TESTING_LIBS) \ src/trunnel/libor-trunnel-testing.a \ src/lib/libtor-trace.a +endif + TOR_LDFLAGS_CRYPTLIB=@TOR_LDFLAGS_openssl@ + TOR_LIBS_CRYPTLIB=@TOR_OPENSSL_LIBS@ + TOR_CFLAGS_CRYPTLIB= + if USE_NSS + TOR_CFLAGS_CRYPTLIB+=@NSS_CFLAGS@ + TOR_LIBS_CRYPTLIB+=@NSS_LIBS@ + endif + # All libraries used to link tor-cov include src/include.am diff --cc src/lib/crypt_ops/include.am index 017d7956d,803d44885..8647a91e8 --- a/src/lib/crypt_ops/include.am +++ b/src/lib/crypt_ops/include.am @@@ -14,8 -14,7 +14,9 @@@ src_lib_libtor_crypt_ops_a_SOURCES = src/lib/crypt_ops/crypto_ed25519.c \ src/lib/crypt_ops/crypto_format.c \ src/lib/crypt_ops/crypto_hkdf.c \ + src/lib/crypt_ops/crypto_init.c \ + src/lib/crypt_ops/crypto_ope.c \ + src/lib/crypt_ops/crypto_openssl_mgt.c \ src/lib/crypt_ops/crypto_pwbox.c \ src/lib/crypt_ops/crypto_rand.c \ src/lib/crypt_ops/crypto_rsa.c \ @@@ -36,10 -53,11 +55,12 @@@ noinst_HEADERS += src/lib/crypt_ops/crypto_digest.h \ src/lib/crypt_ops/crypto_ed25519.h \ src/lib/crypt_ops/crypto_format.h \ - src/lib/crypt_ops/crypto.h \ + src/lib/crypt_ops/crypto_cipher.h \ src/lib/crypt_ops/crypto_hkdf.h \ + src/lib/crypt_ops/crypto_init.h \ + src/lib/crypt_ops/crypto_nss_mgt.h \ src/lib/crypt_ops/crypto_openssl_mgt.h \ + src/lib/crypt_ops/crypto_ope.h \ src/lib/crypt_ops/crypto_pwbox.h \ src/lib/crypt_ops/crypto_rand.h \ src/lib/crypt_ops/crypto_rsa.h \ diff --cc src/tools/include.am index d5924dda5,7c5d3f0bc..cdd5616fb --- a/src/tools/include.am +++ b/src/tools/include.am @@@ -26,18 -26,9 +26,18 @@@ src_tools_tor_gencert_LDADD = $(TOR_CRYPTO_LIBS) \ $(TOR_UTIL_LIBS) \ $(rust_ldadd) \ - @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ $(TOR_LIBS_CRYPTLIB) \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ +src_tools_tor_print_ed_signing_cert_SOURCES = src/tools/tor-print-ed-signing-cert.c +src_tools_tor_print_ed_signing_cert_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ +src_tools_tor_print_ed_signing_cert_LDADD = \ + src/trunnel/libor-trunnel.a \ + $(TOR_CRYPTO_LIBS) \ + $(TOR_UTIL_LIBS) \ - @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ \ ++ @TOR_LIB_MATH@ $(TOR_LIBS_CRYPTLIB) \ + @TOR_LIB_WS32@ @TOR_LIB_USERENV@ + if COVERAGE_ENABLED src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c src_tools_tor_cov_gencert_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)

1 0

[tor/master] Fix issues with crypto_ope compilation now that crypto.h is gone
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit a4c0a0e81eb3616d7d66806e9ac8ea7c8d3bf439 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 19:56:42 2018 -0400 Fix issues with crypto_ope compilation now that crypto.h is gone --- src/lib/crypt_ops/crypto_ope.c | 2 +- src/test/test_crypto_ope.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/crypt_ops/crypto_ope.c b/src/lib/crypt_ops/crypto_ope.c index ca42ae434..fd5d5f377 100644 --- a/src/lib/crypt_ops/crypto_ope.c +++ b/src/lib/crypt_ops/crypto_ope.c @@ -18,8 +18,8 @@ #define CRYPTO_OPE_PRIVATE #include "lib/crypt_ops/crypto_ope.h" -#include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_util.h" +#include "lib/crypt_ops/crypto_cipher.h" #include "lib/log/util_bug.h" #include "lib/malloc/malloc.h" #include "lib/arch/bytes.h" diff --git a/src/test/test_crypto_ope.c b/src/test/test_crypto_ope.c index 7dcad7b4b..4e7b95232 100644 --- a/src/test/test_crypto_ope.c +++ b/src/test/test_crypto_ope.c @@ -7,9 +7,11 @@ #define CRYPTO_OPE_PRIVATE +#include "lib/cc/compat_compiler.h" #include "lib/crypt_ops/crypto_ope.h" -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_cipher.h" #include "lib/encoding/binascii.h" +#include "lib/malloc/malloc.h" #include "test/test.h" #include "tinytest.h"

1 0

[tor/master] Suppress strict-prototypes warning in crypto_nss_mgt.c
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit f83b417bf819ef0cc5f6ff31dd683a53cd7f90f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 08:41:33 2018 -0400 Suppress strict-prototypes warning in crypto_nss_mgt.c --- src/lib/crypt_ops/crypto_nss_mgt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/crypt_ops/crypto_nss_mgt.c b/src/lib/crypt_ops/crypto_nss_mgt.c index 6bcaeabd5..89ef01921 100644 --- a/src/lib/crypt_ops/crypto_nss_mgt.c +++ b/src/lib/crypt_ops/crypto_nss_mgt.c @@ -15,6 +15,7 @@ #include "lib/log/log.h" #include "lib/log/util_bug.h" +DISABLE_GCC_WARNING(strict-prototypes) #include <nss.h> #include <pk11func.h> #include <ssl.h> @@ -22,6 +23,7 @@ #include <prerror.h> #include <prtypes.h> #include <prinit.h> +ENABLE_GCC_WARNING(strict-prototypes) const char * crypto_nss_get_version_str(void)

1 0

[tor/master] Fix double-link of crypto_openssl_mgt.c
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 727f1676d68fca00f2f40f166b5afda3a5728dc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 08:38:59 2018 -0400 Fix double-link of crypto_openssl_mgt.c --- src/lib/crypt_ops/include.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/crypt_ops/include.am b/src/lib/crypt_ops/include.am index 8647a91e8..f6164dd21 100644 --- a/src/lib/crypt_ops/include.am +++ b/src/lib/crypt_ops/include.am @@ -16,7 +16,6 @@ src_lib_libtor_crypt_ops_a_SOURCES = \ src/lib/crypt_ops/crypto_hkdf.c \ src/lib/crypt_ops/crypto_init.c \ src/lib/crypt_ops/crypto_ope.c \ - src/lib/crypt_ops/crypto_openssl_mgt.c \ src/lib/crypt_ops/crypto_pwbox.c \ src/lib/crypt_ops/crypto_rand.c \ src/lib/crypt_ops/crypto_rsa.c \

1 0

[tor/master] Add a cast to make clang happier.
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit b590cc0449e1432a36e61bf259e92c679c8f5b6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 08:36:24 2018 -0400 Add a cast to make clang happier. --- src/lib/crypt_ops/crypto_dh_nss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_dh_nss.c b/src/lib/crypt_ops/crypto_dh_nss.c index 647dfb4e5..9a14b809b 100644 --- a/src/lib/crypt_ops/crypto_dh_nss.c +++ b/src/lib/crypt_ops/crypto_dh_nss.c @@ -174,7 +174,7 @@ crypto_dh_handshake(int severity, crypto_dh_t *dh, peer_key.u.dh.base.data = dh_generator_data; peer_key.u.dh.base.len = 1; peer_key.u.dh.publicValue.data = (unsigned char *)pubkey; - peer_key.u.dh.publicValue.len = pubkey_len; + peer_key.u.dh.publicValue.len = (int) pubkey_len; PK11SymKey *sym = PK11_PubDerive(dh->seckey, &peer_key, PR_FALSE, NULL, NULL, CKM_DH_PKCS_DERIVE,

1 0

[tor/master] When RunAsDaemon is set, crypto_postfork() as needed
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 4f300d547d65e50ac1fd635f8b22714c1544ba33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 16:50:23 2018 -0400 When RunAsDaemon is set, crypto_postfork() as needed --- src/app/config/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1b1889779..eb935fd4e 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -81,6 +81,7 @@ #include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" +#include "lib/crypt_ops/crypto_init.h" #include "feature/dircache/dirserv.h" #include "feature/relay/dns.h" #include "core/or/dos.h" @@ -2026,7 +2027,9 @@ options_act(const or_options_t *old_options) /* Finish backgrounding the process */ if (options->RunAsDaemon) { /* We may be calling this for the n'th time (on SIGHUP), but it's safe. */ - finish_daemon(options->DataDirectory); + int forked = finish_daemon(options->DataDirectory); + if (forked) + crypto_postfork(); } /* See whether we need to enable/disable our once-a-second timer. */

1 0

[tor/master] Make finish_daemon() return a boolean to say whether it did anything.
by nickm＠torproject.org 05 Sep '18

05 Sep '18

commit 622a2c6bee19af3bab0e84702a36ff2df39db7e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 16:59:53 2018 -0400 Make finish_daemon() return a boolean to say whether it did anything. --- src/lib/process/daemon.c | 9 ++++++--- src/lib/process/daemon.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/lib/process/daemon.c b/src/lib/process/daemon.c index 671579838..4836b3951 100644 --- a/src/lib/process/daemon.c +++ b/src/lib/process/daemon.c @@ -102,15 +102,16 @@ start_daemon(void) /** Finish putting the process into daemon mode: drop standard fds, and tell * the parent process to exit. (Note: it's safe to call this more than once: * calls after the first are ignored. Calls start_daemon first if it hasn't - * been called already.) + * been called already.) Return true if we actually did a fork; false if we + * didn't. */ -void +int finish_daemon(const char *desired_cwd) { int nullfd; char c = '.'; if (finish_daemon_called) - return; + return 0; if (!start_daemon_called) start_daemon(); finish_daemon_called = 1; @@ -149,6 +150,8 @@ finish_daemon(const char *desired_cwd) log_err(LD_GENERAL,"write failed. Exiting."); } close(daemon_filedes[1]); + + return 0; } #else /* !(!defined(_WIN32)) */ /* defined(_WIN32) */ diff --git a/src/lib/process/daemon.h b/src/lib/process/daemon.h index 1f26e9222..08cab17e1 100644 --- a/src/lib/process/daemon.h +++ b/src/lib/process/daemon.h @@ -12,6 +12,6 @@ #define TOR_DAEMON_H void start_daemon(void); -void finish_daemon(const char *desired_cwd); +int finish_daemon(const char *desired_cwd); #endif

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 04 Sep '18

04 Sep '18

commit e36d084f73230eeb4abd9b1885776b084fee197a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 4 23:18:07 2018 +0000 Update translations for torbutton-abouttbupdatedtd --- zh_TW/abouttbupdate.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_TW/abouttbupdate.dtd b/zh_TW/abouttbupdate.dtd index 6dc56295b..d4c86ee2e 100644 --- a/zh_TW/abouttbupdate.dtd +++ b/zh_TW/abouttbupdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "。"> <!ENTITY aboutTBUpdate.changeLogHeading "變更歷史紀錄："> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "新的、重新設計的迴路顯示"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "了解更多">

1 0

[translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd
by translation＠torproject.org 04 Sep '18

04 Sep '18

commit 5bd790aa10046ed234e62ff7cc6e3aa5fd6f521e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 4 23:16:48 2018 +0000 Update translations for tba-android_stringsdtd --- zh_TW/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/android_strings.dtd b/zh_TW/android_strings.dtd index e8f193825..71eb0203a 100644 --- a/zh_TW/android_strings.dtd +++ b/zh_TW/android_strings.dtd @@ -667,7 +667,7 @@ just addresses the organization to follow, e.g. "This site is run by " --> <!ENTITY doorhanger_tracking_message_disabled2 "This page includes elements that may track your browsing.">  -<!ENTITY learn_more "Learn More"> +<!ENTITY learn_more "了解更多"> <!ENTITY enable_protection "Enable protection"> <!ENTITY disable_protection "Disable protection">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Sep '18

04 Sep '18

commit 40c4c799565e5921607e8e966e6783baf0ae1a9a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 4 23:15:28 2018 +0000 Update translations for https_everywhere --- zh_TW/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index dcd99720c..c822006fa 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -14,17 +14,17 @@ <!ENTITY https-everywhere.options.generalSettings "一般設定"> <!ENTITY https-everywhere.options.advancedSettings "進階設定"> -<!ENTITY https-everywhere.options.updateChannels "Update Channels"> +<!ENTITY https-everywhere.options.updateChannels "更新頻道"> <!ENTITY https-everywhere.options.enableMixedRulesets "開啟多重條件"> <!ENTITY https-everywhere.options.showDevtoolsTab "顯示開發者工具頁面"> <!ENTITY https-everywhere.options.autoUpdateRulesets "自動更新所有條件"> <!ENTITY https-everywhere.options.updateChannelsWarning "Warning: Adding update channels can cause attackers to hijack your browser. Only edit this section if you know what you're doing!"> -<!ENTITY https-everywhere.options.addUpdateChannel "Add Update Channel"> -<!ENTITY https-everywhere.options.enterUpdateChannelName "Enter update channel name"> +<!ENTITY https-everywhere.options.addUpdateChannel "加入更新頻道"> +<!ENTITY https-everywhere.options.enterUpdateChannelName "輸入更新頻道名稱"> <!ENTITY https-everywhere.options.delete "Delete"> <!ENTITY https-everywhere.options.update "更新"> -<!ENTITY https-everywhere.options.storedRulesetsVersion "Stored rulesets version: "> -<!ENTITY https-everywhere.options.updatesLastChecked "Updates last checked: "> +<!ENTITY https-everywhere.options.storedRulesetsVersion "儲存的規則集版本："> +<!ENTITY https-everywhere.options.updatesLastChecked "最後檢查更新："> <!ENTITY https-everywhere.options.updatesLastCheckedNever "從未"> <!ENTITY https-everywhere.prefs.export_settings "匯出設定值">

1 0