- tor-commits - lists.torproject.org

[tor/master] Use openssl's counter mode implementation when we have 1.0.0 or later
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 9814019a54a9a62e27b9e95eec5c9f0e5519fc57 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 20 21:43:14 2011 -0500 Use openssl's counter mode implementation when we have 1.0.0 or later This shaves about 7% off our per-cell AES crypto time for me; the effect for accelerated AES crypto should be even more, since the AES calculation itself will make an even smaller portion of the counter-mode performance. (We don't want to do this for pre-1.0.0 OpenSSL, since our AES_CTR implementation was actually faster than OpenSSL's there, by about 10%.) Fixes issue #4526. --- changes/aes_hackery | 8 +++-- src/common/aes.c | 88 ++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/changes/aes_hackery b/changes/aes_hackery index 82aae23..b22cefe 100644 --- a/changes/aes_hackery +++ b/changes/aes_hackery @@ -4,11 +4,13 @@ relatively few servers should still be on any version of OpenSSL that doesn't have good optimized assembly AES. - o Major features: + o Major features (AES performance): - Use OpenSSL's EVP interface for AES encryption, so that all AES operations can use hardware acceleration (if present). Resolves issue #4442. - But only use the EVP interface when AES acceleration is enabled, to avoid a performance regression. Resolves issue #4525. - - + - When using OpenSSL 1.0.0 or later, use OpenSSL's counter mode + implementation; it makes AES_CTR about 7% faster than our old one + (which was about 10% faster than the one OpenSSL used to provide). + Resolves issue #4526. diff --git a/src/common/aes.c b/src/common/aes.c index 53c80a3..cec6899 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -17,6 +17,11 @@ #include <openssl/aes.h> #include <openssl/evp.h> #include <openssl/engine.h> +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +/* See comments about which counter mode implementation to use below. */ +#include <openssl/modes.h> +#define USE_OPENSSL_CTR +#endif #include "compat.h" #include "aes.h" #include "util.h" @@ -35,7 +40,13 @@ * faster than indirecting through the EVP layer. */ -/* Include OpenSSL headers as needed. */ +/* We have 2 strategies for counter mode: use our own, or use OpenSSL's. + * + * Here we have a counter mode that's faster than the one shipping with + * OpenSSL pre-1.0 (by about 10%!). But OpenSSL 1.0.0 added a counter mode + * implementation faster than the one here (by about 7%). So we pick which + * one to used based on the Openssl version above. + */ /*======================================================================*/ /* Interface to AES code, and counter implementation */ @@ -48,7 +59,7 @@ struct aes_cnt_cipher { AES_KEY aes; } key; -#if !defined(WORDS_BIGENDIAN) +#if !defined(WORDS_BIGENDIAN) && !defined(USE_OPENSSL_CTR) #define USING_COUNTER_VARS /** These four values, together, implement a 128-bit counter, with * counter0 as the low-order word and counter3 as the high-order word. */ @@ -70,7 +81,11 @@ struct aes_cnt_cipher { /** The encrypted value of ctr_buf. */ uint8_t buf[16]; /** Our current stream position within buf. */ +#ifdef USE_OPENSSL_CTR + unsigned int pos; +#else uint8_t pos; +#endif /** True iff we're using the evp implementation of this cipher. */ uint8_t using_evp; @@ -110,6 +125,7 @@ evaluate_evp_for_aes(int force_val) return 0; } +#ifndef USE_OPENSSL_CTR #if !defined(USING_COUNTER_VARS) #define COUNTER(c, n) ((c)->ctr_buf.buf32[3-(n)]) #else @@ -138,6 +154,7 @@ _aes_fill_buf(aes_cnt_cipher_t *cipher) AES_encrypt(cipher->ctr_buf.buf, cipher->buf, &cipher->key.aes); } } +#endif /** * Return a newly allocated counter-mode AES128 cipher implementation. @@ -171,6 +188,7 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) AES_set_encrypt_key((const unsigned char *)key, key_bits, &cipher->key.aes); cipher->using_evp = 0; } + #ifdef USING_COUNTER_VARS cipher->counter0 = 0; cipher->counter1 = 0; @@ -181,7 +199,12 @@ aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits) memset(cipher->ctr_buf.buf, 0, sizeof(cipher->ctr_buf.buf)); cipher->pos = 0; + +#ifdef USE_OPENSSL_CTR + memset(cipher->buf, 0, sizeof(cipher->buf)); +#else _aes_fill_buf(cipher); +#endif } /** Release storage held by cipher @@ -206,6 +229,18 @@ aes_free_cipher(aes_cnt_cipher_t *cipher) #define UPDATE_CTR_BUF(c, n) #endif +#ifdef USE_OPENSSL_CTR +/* Helper function to use EVP with openssl's counter-mode wrapper. */ +static void evp_block128_fn(const uint8_t in[16], + uint8_t out[16], + const void *key) +{ + EVP_CIPHER_CTX *ctx = (void*)key; + int inl=16, outl=16; + EVP_EncryptUpdate(ctx, out, &outl, in, inl); +} +#endif + /** Encrypt len bytes from input, storing the result in * output. Uses the key in cipher, and advances the counter * by len bytes as it encrypts. @@ -214,20 +249,29 @@ void aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, char *output) { - /* This function alone is up to 5% of our runtime in some profiles; anything - * we could do to make it faster would be great. - * - * Experimenting suggests that unrolling the inner loop into a switch - * statement doesn't help. What does seem to help is making the input and - * output buffers word aligned, and never crypting anything besides an - * integer number of words at a time -- it shaves maybe 4-5% of the per-byte - * encryption time measured by bench_aes. We can't do that with the current - * Tor protocol, though: Tor really likes to crypt things in 509-byte - * chunks. - * - * If we were really ambitous, we'd force len to be a multiple of the block - * size, and shave maybe another 4-5% off. - */ +#ifdef USE_OPENSSL_CTR + if (cipher->using_evp) { + /* In openssl 1.0.0, there's an if'd out EVP_aes_128_ctr in evp.h. If + * it weren't disabled, it might be better just to use that. + */ + CRYPTO_ctr128_encrypt((const unsigned char *)input, + (unsigned char *)output, + len, + &cipher->key.evp, + cipher->ctr_buf.buf, + cipher->buf, + &cipher->pos, + evp_block128_fn); + } else { + AES_ctr128_encrypt((const unsigned char *)input, + (unsigned char *)output, + len, + &cipher->key.aes, + cipher->ctr_buf.buf, + cipher->buf, + &cipher->pos); + } +#else int c = cipher->pos; if (PREDICT_UNLIKELY(!len)) return; @@ -250,6 +294,7 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, UPDATE_CTR_BUF(cipher, 0); _aes_fill_buf(cipher); } +#endif } /** Encrypt len bytes from input, storing the results in place. @@ -259,11 +304,9 @@ aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len, void aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) { - - /* XXXX This function is up to 5% of our runtime in some profiles; - * we should look into unrolling some of the loops; taking advantage - * of alignment, using a bigger buffer, and so on. Not till after 0.1.2.x, - * though. */ +#ifdef USE_OPENSSL_CTR + aes_crypt(cipher, data, len, data); +#else int c = cipher->pos; if (PREDICT_UNLIKELY(!len)) return; @@ -286,6 +329,7 @@ aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len) UPDATE_CTR_BUF(cipher, 0); _aes_fill_buf(cipher); } +#endif } /** Reset the 128-bit counter of cipher to the 16-bit big-endian value @@ -302,6 +346,8 @@ aes_set_iv(aes_cnt_cipher_t *cipher, const char *iv) cipher->pos = 0; memcpy(cipher->ctr_buf.buf, iv, 16); +#ifndef USE_OPENSSL_CTR _aes_fill_buf(cipher); +#endif }

1 0

[tor/master] Merge branch 'more_aes_hackery_rebased'
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 25c9e3aab9237b9d01229eb9bdb73450cc4ccfcb Merge: fcf5c92 fbec45c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 25 10:36:13 2011 -0500 Merge branch 'more_aes_hackery_rebased' Conflicts: changes/aes_hackery changes/aes_hackery | 10 +++ src/common/aes.c | 208 +++++++++++++++++++++++++++++++++--------------- src/common/aes.h | 2 + src/common/crypto.c | 3 + src/test/test_crypto.c | 33 +++++++- 5 files changed, 186 insertions(+), 70 deletions(-) diff --cc changes/aes_hackery index 0000000,b22cefe..8b2ef1a mode 000000,100644..100644 --- a/changes/aes_hackery +++ b/changes/aes_hackery @@@ -1,0 -1,16 +1,10 @@@ - o Code simplification and refactoring: - - Unconditionally use OpenSSL's AES implementation instead of our - old built-in one. OpenSSL's AES has been better for a while, and - relatively few servers should still be on any version of OpenSSL - that doesn't have good optimized assembly AES. - + o Major features (AES performance): - - Use OpenSSL's EVP interface for AES encryption, so that all - AES operations can use hardware acceleration (if present). - Resolves issue #4442. - - But only use the EVP interface when AES acceleration is enabled, - to avoid a performance regression. Resolves issue #4525. + - When using OpenSSL 1.0.0 or later, use OpenSSL's counter mode + implementation; it makes AES_CTR about 7% faster than our old one + (which was about 10% faster than the one OpenSSL used to provide). + Resolves issue #4526. ++ ++ o Major bugfixes (AES performance): ++ - Only use the EVP interface when AES acceleration is enabled, ++ to avoid a 5-7% performance regression. Resolves issue #4525, ++ bugfix on 0.2.3.8-alpha.

1 0

[tor/master] Make AES unit tests cover the AES and the EVP case.
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit fbec45c9b43b22fd4838f395ef602e498f33340f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 10:42:49 2011 -0500 Make AES unit tests cover the AES and the EVP case. --- src/test/test_crypto.c | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 1b338a2..cad8c2f 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -7,6 +7,7 @@ #define CRYPTO_PRIVATE #include "or.h" #include "test.h" +#include "aes.h" /** Run unit tests for Diffie-Hellman functionality. */ static void @@ -95,13 +96,16 @@ test_crypto_rng(void) /** Run unit tests for our AES functionality */ static void -test_crypto_aes(void) +test_crypto_aes(void *arg) { char *data1 = NULL, *data2 = NULL, *data3 = NULL; crypto_cipher_env_t *env1 = NULL, *env2 = NULL; int i, j; char *mem_op_hex_tmp=NULL; + int use_evp = !strcmp(arg,"evp"); + evaluate_evp_for_aes(use_evp); + data1 = tor_malloc(1024); data2 = tor_malloc(1024); data3 = tor_malloc(1024); @@ -670,7 +674,7 @@ test_crypto_s2k(void) /** Test AES-CTR encryption and decryption with IV. */ static void -test_crypto_aes_iv(void) +test_crypto_aes_iv(void *arg) { crypto_cipher_env_t *cipher; char *plain, *encrypted1, *encrypted2, *decrypted1, *decrypted2; @@ -678,6 +682,9 @@ test_crypto_aes_iv(void) char key1[16], key2[16]; ssize_t encrypted_size, decrypted_size; + int use_evp = !strcmp(arg,"evp"); + evaluate_evp_for_aes(use_evp); + plain = tor_malloc(4095); encrypted1 = tor_malloc(4095 + 1 + 16); encrypted2 = tor_malloc(4095 + 1 + 16); @@ -851,18 +858,36 @@ test_crypto_base32_decode(void) ; } +static void * +pass_data_setup_fn(const struct testcase_t *testcase) +{ + return testcase->setup_data; +} +static int +pass_data_cleanup_fn(const struct testcase_t *testcase, void *ptr) +{ + (void)ptr; + (void)testcase; + return 1; +} +static const struct testcase_setup_t pass_data = { + pass_data_setup_fn, pass_data_cleanup_fn +}; + #define CRYPTO_LEGACY(name) \ { #name, legacy_test_helper, 0, &legacy_setup, test_crypto_ ## name } struct testcase_t crypto_tests[] = { CRYPTO_LEGACY(formats), CRYPTO_LEGACY(rng), - CRYPTO_LEGACY(aes), + { "aes_AES", test_crypto_aes, TT_FORK, &pass_data, (void*)"aes" }, + { "aes_EVP", test_crypto_aes, TT_FORK, &pass_data, (void*)"evp" }, CRYPTO_LEGACY(sha), CRYPTO_LEGACY(pk), CRYPTO_LEGACY(dh), CRYPTO_LEGACY(s2k), - CRYPTO_LEGACY(aes_iv), + { "aes_iv_AES", test_crypto_aes_iv, TT_FORK, &pass_data, (void*)"aes" }, + { "aes_iv_EVP", test_crypto_aes_iv, TT_FORK, &pass_data, (void*)"evp" }, CRYPTO_LEGACY(base32_decode), END_OF_TESTCASES };

1 0

[tor/master] tor-gencert: Fix a minor formatting issue in an error message (re: #4574)
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit f1c47586ac2b66e41948f4e25ba1a6b3bccb84d7 Author: Peter Palfrader <peter(a)palfrader.org> Date: Fri Nov 25 14:16:33 2011 +0100 tor-gencert: Fix a minor formatting issue in an error message (re: #4574) --- src/tools/tor-gencert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 974a58b..57f82b1 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -153,7 +153,7 @@ parse_commandline(int argc, char **argv) } months_lifetime = atoi(argv[++i]); if (months_lifetime > 24 || months_lifetime < 0) { - fprintf(stderr, "Lifetime (in months) was out of range."); + fprintf(stderr, "Lifetime (in months) was out of range.\n"); return 1; } } else if (!strcmp(argv[i], "-r") || !strcmp(argv[i], "--reuse")) {

1 0

[tor/master] And add a changelog entry for the 4574 fix. (closes: #4574)
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit fcf5c92e21dc6b39aa75e6d709f76c82276d3455 Author: Peter Palfrader <peter(a)palfrader.org> Date: Fri Nov 25 14:16:57 2011 +0100 And add a changelog entry for the 4574 fix. (closes: #4574) --- changes/bug4574 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4574 b/changes/bug4574 new file mode 100644 index 0000000..0a57957 --- /dev/null +++ b/changes/bug4574 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a minor formatting issue in one of tor-gencert's error messages. + Fixes bug 4574. +

1 0

[tor-cloud/master] How to find the address of your bridge, solves #4571
by runa＠torproject.org 25 Nov '11

25 Nov '11

commit ff6189f011066ec277f55d53d88806a052bc6d6e Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 25 13:39:16 2011 +0000 How to find the address of your bridge, solves #4571 --- html/index.html | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/html/index.html b/html/index.html index 20a9a44..6327488 100644 --- a/html/index.html +++ b/html/index.html @@ -263,9 +263,11 @@ 1. How much does it cost? There is no fee charged by the Tor Project, Inc for you to run a Tor Cloud image. Amazon does, however, charge instances - according to their <a href="http://aws.amazon.com/ec2/pricing/">pricing</a>. - We have <a href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4">estimated</a> - that running a bridge will cost around $30 a month. + according to their <a + href="http://aws.amazon.com/ec2/pricing/">pricing</a>. See + How much does it cost? on the <a + href="https://cloud.torproject.org/">front page</a> for more + information. 2. The instance is running, what's next? You should not have to do anything once the instance is up and @@ -274,7 +276,17 @@ After that, the address for your bridge will be given out to users. - 3. How can I check if my bridge is running? + 3. How do I find the address of my bridge? + To find the address of your bridge, log on to the AWS Management + Console, find your instance, and click on it. The bottom half of the + page will show some details about the instance you have selected, + including Public DNS. If the AWS Management Console says + that the Public DNS for your instance is + ec2-012-34-56-789.compute-1.amazonaws.com, then you know that the IP + address is 012.34.56.789. All of the bridges run on port 443, so the + address of your bridge is 012.34.56.789:443. + + 4. How can I check if my bridge is running? There are two ways you can check to see if your bridge is running; you can either log on to the instance and check /var/log/tor/log, or you can use Tor and connect to your @@ -283,46 +295,46 @@ href="https://www.torproject.org/docs/bridges.html.en">Tor Project website</a>. - 4. I can't connect as user root, what's wrong? + 5. I can't connect as user root, what's wrong? When you right-click and choose connect, AWS will suggest that you use root as the username. This is wrong. You need to use ubuntu as the username if you wish to connect to your server via SSH. - 5. How do I stop or terminate the instance? + 6. How do I stop or terminate the instance? To stop or terminate the instance, log on to the AWS Management Console, find your instance, right click on it and choose either "Stop" or "Terminate". "Stop" will just shutdown the instance as normal and will allow you to start it up again later. "Terminate" will delete the instance from your AWS account. - 6. How do I change the IP address of my instance? + 7. How do I change the IP address of my instance? To change the IP address of your instance, log on to the AWS Management Console, find your instance, right click on it and choose "Stop". Once the instance has shut down completely, right click on it again and choose "Start". The instance will be assigned a new IP address when it starts up again. - 7. What's in the Tor configuration file? + 8. What's in the Tor configuration file? The Tor configuration file that the images have been configured with can be found <a href="https://cloud.torproject.org/torrc.txt">here</a>. - 8. Will the images automatically download and install package updates? + 9. Will the images automatically download and install package updates? Yes, the images have all been configured with the <a href="https://help.ubuntu.com/community/AutomaticSecurityUpdates">unattended-upgrades</a> package. This means that your system will automatically download and install updates. - 9. Will you let me know when you publish new images? + 10. Will you let me know when you publish new images? New cloud images will be announced on <a href="https://twitter.com/torproject">Twitter</a>, <a href="https://identi.ca/torproject">identi.ca</a>, <a href="https://blog.torproject.org">our blog</a> and on the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> mailing list. - 10. Where do I report a bug I am encountering? + 11. Where do I report a bug I am encountering? If you think the bug you have found is specific to the Tor Cloud images we provide, please <a href="https://trac.torproject.org">file a bug</a> or send an email to help AT rt.torproject.org. - 11. Is there an IRC channel where I can ask about Tor Cloud? + 12. Is there an IRC channel where I can ask about Tor Cloud? Yes, simply join #tor on irc.oftc.net and ask your question. It may take a while before we get back to you, so please be patient. - 12. I have a question that is not answered here, what do I do? + 13. I have a question that is not answered here, what do I do? Please send an email to help AT rt.torproject.org. </div>

1 0

[tor/master] Handle build-trees better.
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 86be8fcf0a1d979c50452d681e5090418d444987 Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Sep 7 18:04:45 2011 +0200 Handle build-trees better. Properly create git revision and source file sha1sums include files when building tor not in its source tree but in a dedicated build tree. --- src/common/Makefile.am | 4 ++-- src/or/Makefile.am | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 2244fe5..2920e73 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -56,9 +56,9 @@ noinst_HEADERS = \ common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | @SED@ -n 's/^$.*$$$/"\1\\n"/p' > common_sha1.i; \ + (cd "$(srcdir)" && @SHA1SUM@ $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/^$.*$$$/"\1\\n"/p' > common_sha1.i; \ elif test "@OPENSSL@" != none; then \ - @OPENSSL@ sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) | @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > common_sha1.i; \ + (cd "$(srcdir)" && @OPENSSL@ sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > common_sha1.i; \ else \ rm common_sha1.i; \ touch common_sha1.i; \ diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 67adf50..a568208 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -126,8 +126,9 @@ tor_main.o: micro-revision.i micro-revision.i: FORCE @rm -f micro-revision.tmp; \ - if test -d ../../.git && test -x "`which git 2>&1;true`"; then \ - HASH="`git rev-parse --short=16 HEAD`"; \ + if test -d "$(top_srcdir)/.git" && \ + test -x "`which git 2>&1;true`"; then \ + HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \ echo \"$$HASH\" > micro-revision.tmp; \ fi; \ if test ! -f micro-revision.tmp ; then \ @@ -141,10 +142,10 @@ micro-revision.i: FORCE or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES) if test "@SHA1SUM@" != none; then \ - @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES) | \ + (cd "$(srcdir)" && @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES)) | \ @SED@ -n 's/^$.*$$$/"\1\\n"/p' > or_sha1.i; \ elif test "@OPENSSL@" != none; then \ - @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES) | \ + (cd "$(srcdir)" && @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES)) | \ @SED@ -n 's/SHA1($.*$)= $.*$/"\2 \1\\n"/p' > or_sha1.i; \ else \ rm or_sha1.i; \

1 0

[tor/master] And a changes file for bug3953
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit d951e2042654bdd809ba085ec19a18a14cb8f63a Author: Peter Palfrader <peter(a)palfrader.org> Date: Wed Sep 7 18:14:03 2011 +0200 And a changes file for bug3953 --- changes/bug3953 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug3953 b/changes/bug3953 new file mode 100644 index 0000000..5b3919f --- /dev/null +++ b/changes/bug3953 @@ -0,0 +1,6 @@ + o Build fixes: + - Properly handle the case where the build-tree is not the same + as the source tree when generating src/common/common_sha1.i, + src/or/micro-revision.i and src/or/or_sha1.i. Fixes bug 3953; + bugfix on 0.2.0.1-alpha. +

1 0

[tor/master] Basic support for a "make version" target to declare the source version
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 916aa8022d8bafac86966b71fb5b43f20cf91ccd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 24 23:53:18 2011 -0500 Basic support for a "make version" target to declare the source version This is katmagic's idea. See issue 4400. --- Makefile.am | 7 +++++++ changes/make_version | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index cd0d883..b8d18d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,3 +70,10 @@ check-logs: ./contrib/checkLogs.pl \ src/*/*.[ch] | sort -n +version: + @echo "Tor @VERSION@" + @if test -d "$(top_srcdir)/.git" && test -x "`which git 2>&1;true`"; then \ + echo -n "git: " ;\ + (cd "$(top_srcdir)" && git rev-parse --short=16 HEAD); \ + fi + diff --git a/changes/make_version b/changes/make_version new file mode 100644 index 0000000..b736a87 --- /dev/null +++ b/changes/make_version @@ -0,0 +1,4 @@ + o Minor features (build): + - Running "make version" now displays the version of Tor that + we're about to build. Idea from katmagic; resolves issue 4400. +

1 0

[tor/master] Merge remote-tracking branch 'ioerror/DisableDebuggerAttachment'
by nickm＠torproject.org 25 Nov '11

25 Nov '11

commit 68114ca52cbed0b7970a60717be4ca22ffdc5d00 Merge: f634228 f79a75f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 24 23:38:32 2011 -0500 Merge remote-tracking branch 'ioerror/DisableDebuggerAttachment' Conflicts: src/or/config.c changes/disable_debugger_attachment | 14 ++++++++ doc/tor.1.txt | 14 ++++++++ src/or/config.c | 57 +++++++++++++++++++++++++++++++++++ src/or/or.h | 2 + 4 files changed, 87 insertions(+), 0 deletions(-) diff --cc src/or/config.c index ef9e4ec,5a153b0..b8ff6e8 --- a/src/or/config.c +++ b/src/or/config.c @@@ -42,9 -40,14 +42,17 @@@ #include "procmon.h" +/* From main.c */ +extern int quiet_level; + + /* Includes for the process attaching prevention */ + #if defined(HAVE_SYS_PRCTL_H) && defined(__linux__) + #include <sys/prctl.h> + #elif defined(__APPLE__) + #include <sys/types.h> + #include <sys/ptrace.h> + #endif + /** Enumeration of types which option values can take */ typedef enum config_type_t { CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */ @@@ -246,8 -246,9 +254,9 @@@ static config_var_t _option_vars[] = V(DirReqStatistics, BOOL, "1"), VAR("DirServer", LINELIST, DirServers, NULL), V(DisableAllSwap, BOOL, "0"), + V(DisableDebuggerAttachment, BOOL, "1"), V(DisableIOCP, BOOL, "1"), - V(DNSPort, PORT, "0"), + V(DNSPort, LINELIST, NULL), V(DNSListenAddress, LINELIST, NULL), V(DownloadExtraInfo, BOOL, "0"), V(EnforceDistinctSubnets, BOOL, "1"), @@@ -678,9 -658,50 +687,50 @@@ get_dirportfrontpage(void return global_dirfrontpagecontents; } + /* We only use the linux prctl for now. There is no Win32 support; this may + * also work on various BSD systems and Mac OS X - send testing feedback! + * + * On recent Gnu/Linux kernels it is possible to create a system-wide policy + * that will prevent non-root processes from attaching to other processes + * unless they are the parent process; thus gdb can attach to programs that + * they execute but they cannot attach to other processes running as the same + * user. The system wide policy may be set with the sysctl + * kernel.yama.ptrace_scope or by inspecting /proc/sys/kernel/yama/ptrace_scope + * and it is 1 by default on Ubuntu 11.04. + * + * This ptrace scope will be ignored on Gnu/Linux for users with + * CAP_SYS_PTRACE and so it is very likely that root will still be able to + * attach to the Tor process. + */ + /** Attempt to disable debugger attachment. */ + static int tor_disable_debugger_attach(void) { + int r; + r = -1; + log_debug(LD_CONFIG, + "Attemping to disable debugger attachment to Tor for unprivileged users."); + #if defined(__linux__) && defined(HAVE_SYS_PRCTL_H) && defined(HAVE_PRCTL) + #ifdef PR_SET_DUMPABLE + r = prctl(PR_SET_DUMPABLE, 0); + #endif + #endif + #if defined(__APPLE__) && defined(PT_DENY_ATTACH) + r = ptrace(PT_DENY_ATTACH, 0, 0, 0); + #endif + + // XXX: TODO - Mac OS X has dtrace and this may be disabled - implement it here + // XXX: TODO - Windows probably has something similar - implement it here + if (r == 0) { + log_debug(LD_CONFIG,"Debugger attachment disabled for unprivileged users."); + } else { + log_warn(LD_CONFIG, "Unable to disable ptrace attach: %s", + strerror(errno)); + } + return r; + } + /** Allocate an empty configuration object of a given format type. */ static void * -config_alloc(config_format_t *fmt) +config_alloc(const config_format_t *fmt) { void *opts = tor_malloc_zero(fmt->size); *(uint32_t*)STRUCT_VAR_P(opts, fmt->magic_offset) = fmt->magic; @@@ -1277,15 -1238,20 +1327,22 @@@ get_effective_bwburst(const or_options_ * here yet. Some is still in do_hup() and other places. */ static int -options_act(or_options_t *old_options) +options_act(const or_options_t *old_options) { config_line_t *cl; - or_options_t *options = get_options(); + or_options_t *options = get_options_mutable(); int running_tor = options->command == CMD_RUN_TOR; char *msg; + const int transition_affects_workers = + old_options && options_transition_affects_workers(old_options, options); + /* disable ptrace and later, other basic debugging techniques */ + if (options->DisableDebuggerAttachment) { + tor_disable_debugger_attach(); + } else { + log_notice(LD_CONFIG,"Debugger attachment enabled for unprivileged users."); + } + if (running_tor && !have_lockfile()) { if (try_locking(options, 1) < 0) return -1;

1 0