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

[tor/master] Merge remote-tracking branch 'ffmancera/bug24658-openssl'
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 13a2acba3c951a049f89b2c553e3139008032fe8 Merge: 48a51c5f8 f2fca5197 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 23 14:02:45 2018 -0500 Merge remote-tracking branch 'ffmancera/bug24658-openssl' src/common/aes.c | 1 + src/common/compat_openssl.h | 2 +- src/common/crypto.c | 131 +----------------------------------- src/common/crypto.h | 35 ---------- src/common/crypto_curve25519.h | 1 + src/common/… [View More]crypto_openssl_mgt.c | 145 ++++++++++++++++++++++++++++++++++++++++ src/common/crypto_openssl_mgt.h | 85 +++++++++++++++++++++++ src/common/include.am | 2 + 8 files changed, 236 insertions(+), 166 deletions(-) diff --cc src/common/crypto.c index b519caed0,3fba2da5d..3ff3a98e0 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@@ -3494,14 -3363,7 +3366,13 @@@ crypto_global_cleanup(void } #endif /* !defined(NEW_THREAD_API) */ - tor_free(crypto_openssl_version_str); - tor_free(crypto_openssl_header_version_str); + crypto_openssl_free_all(); + + crypto_early_initialized_ = 0; + crypto_global_initialized_ = 0; + have_seeded_siphash = 0; + siphash_unset_global_key(); + return 0; } diff --cc src/common/crypto.h index eca115fa7,879af45fe..3caa23773 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@@ -19,43 -19,9 +19,10 @@@ #include "torint.h" #include "testsupport.h" #include "compat.h" +#include "util.h" - #include <openssl/engine.h> #include "keccak-tiny/keccak-tiny.h" - /* - Macro to create an arbitrary OpenSSL version number as used by - OPENSSL_VERSION_NUMBER or SSLeay(), since the actual numbers are a bit hard - to read. - - Don't use this directly, instead use one of the other OPENSSL_V macros - below. - - The format is: 4 bits major, 8 bits minor, 8 bits fix, 8 bits patch, 4 bit - status. - */ - #define OPENSSL_VER(a,b,c,d,e) \ - (((a)<<28) | \ - ((b)<<20) | \ - ((c)<<12) | \ - ((d)<< 4) | \ - (e)) - /** An openssl release number. For example, OPENSSL_V(0,9,8,'j') is the - * version for the released version of 0.9.8j */ - #define OPENSSL_V(a,b,c,d) \ - OPENSSL_VER((a),(b),(c),(d)-'a'+1,0xf) - /** An openssl release number for the first release in the series. For - * example, OPENSSL_V_NOPATCH(1,0,0) is the first released version of OpenSSL - * 1.0.0. */ - #define OPENSSL_V_NOPATCH(a,b,c) \ - OPENSSL_VER((a),(b),(c),0,0xf) - /** The first version that would occur for any alpha or beta in an openssl - * series. For example, OPENSSL_V_SERIES(0,9,8) is greater than any released - * 0.9.7, and less than any released 0.9.8. */ - #define OPENSSL_V_SERIES(a,b,c) \ - OPENSSL_VER((a),(b),(c),0,0) - /** Length of the output of our message digest. */ #define DIGEST_LEN 20 /** Length of the output of our second (improved) message digests. (For now [View Less]

1 0

[tor/master] Rename crypto_openssl.[ch] to crypto_openssl_mgt.[ch]
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 7684949d37d42a7798df2486fd4da1994f0f7686 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Thu Jan 18 21:02:26 2018 +0100 Rename crypto_openssl.[ch] to crypto_openssl_mgt.[ch] Rename crypto_openssl.[ch] to crypto_openssl_mgt.[ch] because it is possible we need crypto_openssl.[ch] in the future. Follows #24658. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- src/common/{crypto_openssl.c … [View More]

1 0

[tor/master] Move the openssl namespace back into .c files.
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit f2fca519762cdd37c8559eb95bb8b41973225d38 Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Mon Jan 22 16:48:33 2018 +0100 Move the openssl namespace back into .c files. As we're trying not to have all the other modules in Tor, we moved the openssl namespace includes back into crypto.c and crypto_openssl_mgt.c files. Follows #24658. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- src/common/crypto.c … [View More] | 15 +++++++++++++++ src/common/crypto_openssl_mgt.c | 15 +++++++++++++++ src/common/crypto_openssl_mgt.h | 15 --------------- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 96a1f7c00..3fba2da5d 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -29,6 +29,21 @@ #include "crypto_ed25519.h" #include "crypto_format.h" +DISABLE_GCC_WARNING(redundant-decls) + +#include <openssl/err.h> +#include <openssl/rsa.h> +#include <openssl/pem.h> +#include <openssl/evp.h> +#include <openssl/engine.h> +#include <openssl/rand.h> +#include <openssl/bn.h> +#include <openssl/dh.h> +#include <openssl/conf.h> +#include <openssl/hmac.h> + +ENABLE_GCC_WARNING(redundant-decls) + #if __GNUC__ && GCC_VERSION >= 402 #if GCC_VERSION >= 406 #pragma GCC diagnostic pop diff --git a/src/common/crypto_openssl_mgt.c b/src/common/crypto_openssl_mgt.c index c19da5b9f..ca91e12d1 100644 --- a/src/common/crypto_openssl_mgt.c +++ b/src/common/crypto_openssl_mgt.c @@ -12,6 +12,21 @@ #include "crypto_openssl_mgt.h" +DISABLE_GCC_WARNING(redundant-decls) + +#include <openssl/err.h> +#include <openssl/rsa.h> +#include <openssl/pem.h> +#include <openssl/evp.h> +#include <openssl/engine.h> +#include <openssl/rand.h> +#include <openssl/bn.h> +#include <openssl/dh.h> +#include <openssl/conf.h> +#include <openssl/hmac.h> + +ENABLE_GCC_WARNING(redundant-decls) + #ifndef NEW_THREAD_API /** A number of preallocated mutexes for use by OpenSSL. */ static tor_mutex_t **openssl_mutexes_ = NULL; diff --git a/src/common/crypto_openssl_mgt.h b/src/common/crypto_openssl_mgt.h index 9b887abd5..09b673796 100644 --- a/src/common/crypto_openssl_mgt.h +++ b/src/common/crypto_openssl_mgt.h @@ -18,21 +18,6 @@ #include <openssl/engine.h> -DISABLE_GCC_WARNING(redundant-decls) - -#include <openssl/err.h> -#include <openssl/rsa.h> -#include <openssl/pem.h> -#include <openssl/evp.h> -#include <openssl/engine.h> -#include <openssl/rand.h> -#include <openssl/bn.h> -#include <openssl/dh.h> -#include <openssl/conf.h> -#include <openssl/hmac.h> - -ENABLE_GCC_WARNING(redundant-decls) - /* Macro to create an arbitrary OpenSSL version number as used by OPENSSL_VERSION_NUMBER or SSLeay(), since the actual numbers are a bit hard [View Less]

1 0

[tor/master] Tweaks into functions and variables in crypto_openssl_mgt.[ch]
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit b3aa7be26c121d1a1fd6df7ab240745a08b6b406 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Fri Jan 19 18:07:49 2018 +0100 Tweaks into functions and variables in crypto_openssl_mgt.[ch] Renamed free_openssl() to crypto_openssl_free_all(). Also we made variables and functions static again. Follows #24658. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- src/common/crypto.c | … [View More]2 +- src/common/crypto_openssl_mgt.c | 19 +++++++++++++------ src/common/crypto_openssl_mgt.h | 10 +--------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 12f4270cc..96a1f7c00 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3348,7 +3348,7 @@ crypto_global_cleanup(void) } #endif /* !defined(NEW_THREAD_API) */ - free_openssl(); + crypto_openssl_free_all(); return 0; } diff --git a/src/common/crypto_openssl_mgt.c b/src/common/crypto_openssl_mgt.c index ff9052b56..c19da5b9f 100644 --- a/src/common/crypto_openssl_mgt.c +++ b/src/common/crypto_openssl_mgt.c @@ -14,15 +14,22 @@ #ifndef NEW_THREAD_API /** A number of preallocated mutexes for use by OpenSSL. */ -tor_mutex_t **openssl_mutexes_ = NULL; +static tor_mutex_t **openssl_mutexes_ = NULL; /** How many mutexes have we allocated for use by OpenSSL? */ -int n_openssl_mutexes_ = 0; +static int n_openssl_mutexes_ = 0; #endif /* !defined(NEW_THREAD_API) */ +/** Declare STATIC functions */ +STATIC char * parse_openssl_version_str(const char *raw_version); +#ifndef NEW_THREAD_API +STATIC void openssl_locking_cb_(int mode, int n, const char *file, int line); +STATIC void tor_set_openssl_thread_id(CRYPTO_THREADID *threadid); +#endif + /* Returns a trimmed and human-readable version of an openssl version string * <b>raw_version</b>. They are usually in the form of 'OpenSSL 1.0.0b 10 * May 2012' and this will parse them into a form similar to '1.0.0b' */ -char * +STATIC char * parse_openssl_version_str(const char *raw_version) { const char *end_of_version = NULL; @@ -72,7 +79,7 @@ crypto_openssl_get_header_version_str(void) #ifndef NEW_THREAD_API /** Helper: OpenSSL uses this callback to manipulate mutexes. */ -void +STATIC void openssl_locking_cb_(int mode, int n, const char *file, int line) { (void)file; @@ -88,7 +95,7 @@ openssl_locking_cb_(int mode, int n, const char *file, int line) tor_mutex_release(openssl_mutexes_[n]); } -void +STATIC void tor_set_openssl_thread_id(CRYPTO_THREADID *threadid) { CRYPTO_THREADID_set_numeric(threadid, tor_get_thread_id()); @@ -115,7 +122,7 @@ setup_openssl_threading(void) /** free OpenSSL variables */ void -free_openssl(void) +crypto_openssl_free_all(void) { tor_free(crypto_openssl_version_str); tor_free(crypto_openssl_header_version_str); diff --git a/src/common/crypto_openssl_mgt.h b/src/common/crypto_openssl_mgt.h index 0c6bccad4..9b887abd5 100644 --- a/src/common/crypto_openssl_mgt.h +++ b/src/common/crypto_openssl_mgt.h @@ -86,23 +86,15 @@ ENABLE_GCC_WARNING(redundant-decls) #define NEW_THREAD_API #endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) && ... */ -tor_mutex_t **openssl_mutexes_; -int n_openssl_mutexes_; - /* global openssl state */ const char * crypto_openssl_get_version_str(void); const char * crypto_openssl_get_header_version_str(void); -/* generics OpenSSL functions */ -char * parse_openssl_version_str(const char *raw_version); -void openssl_locking_cb_(int mode, int n, const char *file, int line); -void tor_set_openssl_thread_id(CRYPTO_THREADID *threadid); - /* OpenSSL threading setup function */ int setup_openssl_threading(void); /* Tor OpenSSL utility functions */ -void free_openssl(void); +void crypto_openssl_free_all(void); #endif /* !defined(TOR_CRYPTO_OPENSSL_H) */ [View Less]

1 0

[tor/master] Add crypto_openssl_mgt.[ch] for compiling dependencies.
by nickm＠torproject.org 23 Jan '18

23 Jan '18

commit 5cd74b4884d35b43e464a3dcc6125f7ca2a3b0e3 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Fri Jan 19 18:56:13 2018 +0100 Add crypto_openssl_mgt.[ch] for compiling dependencies. Included crypto_openssl_mgt.[ch] into the appropiate files in order to resolve compiling and dependencies issues. Follows #24658. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- src/common/aes.c | … [View More]

1 0

[translation/tor-messenger-uiproperties] Update translations for tor-messenger-uiproperties
by translation＠torproject.org 23 Jan '18

23 Jan '18

commit 84ac49a2f6d0db14cab88f4b56008a5bcf74830a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 23 16:50:18 2018 +0000 Update translations for tor-messenger-uiproperties --- br/ui.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/ui.properties b/br/ui.properties index de5c23213..389bb0179 100644 --- a/br/ui.properties +++ b/br/ui.properties @@ -2,7 +2,7 @@ start.label=Start private conversation end.label=End private … [View More]

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 23 Jan '18

23 Jan '18

commit a6d294fee4b54acc2089422ee8e024dd3a662e45 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 23 16:49:33 2018 +0000 Update translations for tor-messenger-fingerdtd --- br/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/finger.dtd b/br/finger.dtd index d901e2aa0..c59340a23 100644 --- a/br/finger.dtd +++ b/br/finger.dtd @@ -10,6 +10,6 @@ <!ENTITY finger.intro "Manage the list of fingerprints you've seen."> <!… [View More]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Jan '18

23 Jan '18

commit d53f6dc729f4c266de51a9a3783059d2334ec272 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 23 16:47:06 2018 +0000 Update translations for tails-misc --- br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br.po b/br.po index 080ba128b..148f3be5f 100644 --- a/br.po +++ b/br.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-… [View More]

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 23 Jan '18

23 Jan '18

commit 4f89b80ef0d07e4425d37b712242b4bd72c5a91a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 23 16:46:27 2018 +0000 Update translations for mat-gui --- br.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br.po b/br.po index ccda2cba2..540834b9c 100644 --- a/br.po +++ b/br.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-… [View More]

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 23 Jan '18

23 Jan '18

commit c64b63189cb350480137291598f60252ad0008b5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 23 16:46:14 2018 +0000 Update translations for torbirdy --- br/torbirdy.dtd | 2 -- 1 file changed, 2 deletions(-) diff --git a/br/torbirdy.dtd b/br/torbirdy.dtd index d7ed48f16..bdccae1dd 100644 --- a/br/torbirdy.dtd +++ b/br/torbirdy.dtd @@ -40,8 +40,6 @@ <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> <!ENTITY torbirdy.prefs.… [View More]

1 0