June 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.2] pem_decode(): Tolerate CRLF line endings
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 5721ec22d8be99a6f24fa69d51d0cbdc4ff21739 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 11 09:40:04 2020 -0400 pem_decode(): Tolerate CRLF line endings Fixes bug 33032; bugfix on 0.3.5.1-alpha when we introduced our own PEM decoder. --- changes/bug33032 | 6 ++++++ src/lib/encoding/pem.c | 8 +++++++- src/test/test_pem.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/changes/bug33032 b/changes/bug33032 new file mode 100644 index 000000000..0c665f25d --- /dev/null +++ b/changes/bug33032 @@ -0,0 +1,6 @@ + o Minor bugfixes (key portability): + - When reading PEM-encoded key data, tolerate CRLF line-endings even if + we are not running on Windows. Previously, non-Windows hosts + would reject these line-endings in certain positions, making + certain key files hard to move from one host to another. + Fixes bug 33032; bugfix on 0.3.5.1-alpha. diff --git a/src/lib/encoding/pem.c b/src/lib/encoding/pem.c index 24b238b13..51f37d084 100644 --- a/src/lib/encoding/pem.c +++ b/src/lib/encoding/pem.c @@ -85,13 +85,19 @@ pem_decode(uint8_t *dest, size_t destlen, const char *src, size_t srclen, src = eat_whitespace_eos(src, eos); char *tag = NULL; - tor_asprintf(&tag, "-----BEGIN %s-----\n", objtype); + tor_asprintf(&tag, "-----BEGIN %s-----", objtype); if ((size_t)(eos-src) < strlen(tag) || fast_memneq(src, tag, strlen(tag))) { tor_free(tag); return -1; } src += strlen(tag); tor_free(tag); + /* At this point we insist on spaces (including CR), then an LF. */ + src = eat_whitespace_eos_no_nl(src, eos); + if (src == eos || *src != '\n') { + /* Extra junk at end of line: this isn't valid. */ + return -1; + } // NOTE lack of trailing \n. We do not enforce its presence. tor_asprintf(&tag, "\n-----END %s-----", objtype); diff --git a/src/test/test_pem.c b/src/test/test_pem.c index 865688b1a..9eb99181e 100644 --- a/src/test/test_pem.c +++ b/src/test/test_pem.c @@ -115,8 +115,38 @@ test_crypto_pem_decode(void *arg) ; } +static void +test_crypto_pem_decode_crlf(void *arg) +{ + (void)arg; + char crlf_version[4096]; + uint8_t buf[4096]; + + /* Convert 'expected' to a version with CRLF instead of LF. */ + const char *inp = expected; + char *outp = crlf_version; + while (*inp) { + if (*inp == '\n') { + *outp++ = '\r'; + } + *outp++ = *inp++; + } + *outp = 0; + + /* Decoding should succeed (or else we have bug 33032 again) */ + int n = pem_decode(buf, sizeof(buf), + crlf_version, strlen(crlf_version), + "WOMBAT QUOTE"); + tt_int_op(n, OP_EQ, strlen(example_pre)); + tt_mem_op(buf, OP_EQ, example_pre, n); + + done: + ; +} + struct testcase_t pem_tests[] = { { "encode", test_crypto_pem_encode, 0, NULL, NULL }, { "decode", test_crypto_pem_decode, 0, NULL, NULL }, + { "decode_crlf", test_crypto_pem_decode_crlf, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 483082b57bfb2535477530fe84d8c92c70be2fa1 Merge: b0bfee8c7 c3ad2a1d2 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:48:49 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug33032 | 6 ++++++ src/lib/encoding/pem.c | 8 +++++++- src/test/test_pem.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Merge branch 'tor-github/pr/1785' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit c3ad2a1d2367d6c0ba5c1c81491770056e881a77 Merge: bebdd2888 5721ec22d Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:47:55 2020 +0000 Merge branch 'tor-github/pr/1785' into maint-0.3.5 changes/bug33032 | 6 ++++++ src/lib/encoding/pem.c | 8 +++++++- src/test/test_pem.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] When initializing pthreads, always set the main thread.
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 4f6901d7cc827e5bfa98467b7a568f725ce7fa9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 6 09:37:12 2020 -0500 When initializing pthreads, always set the main thread. Fixes bug 32884. This is a bugfix on 0.3.3.1-alpha, when we started allowing restart-in-process with tor_api.h. --- changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug32884 b/changes/bug32884 new file mode 100644 index 000000000..9ab1d2446 --- /dev/null +++ b/changes/bug32884 @@ -0,0 +1,5 @@ + o Minor bugfixes (embedded Tor): + - When starting Tor any time after the first time in a process, register + the thread in which it is running as the main thread. Previously, we + only did this on Windows, which could lead to bugs like 23081 on + non-Windows platforms. Fixes bug 32884; bugfix on 0.3.3.1-alpha. diff --git a/src/lib/thread/compat_pthreads.c b/src/lib/thread/compat_pthreads.c index 05efe9cfd..6f7ecd17d 100644 --- a/src/lib/thread/compat_pthreads.c +++ b/src/lib/thread/compat_pthreads.c @@ -265,6 +265,6 @@ tor_threads_init(void) pthread_attr_setdetachstate(&attr_detached, PTHREAD_CREATE_DETACHED); tor_assert(ret2 == 0); threads_initialized = 1; - set_main_thread(); } + set_main_thread(); }

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742 Merge: 0c0214bcc 4f6901d7c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:35:13 2020 +0000 Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5 changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit b0bfee8c783b495ece772189d478dad2628bc159 Merge: d235e523d bebdd2888 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit bebdd2888fd43510ff7786c6c8f52cd8a5565742 Merge: 0c0214bcc 4f6901d7c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:35:13 2020 +0000 Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5 changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit c57896a76e2e858a74c8ea9c9c037761b0b40e5b Merge: eef77227e b0bfee8c7 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit b0bfee8c783b495ece772189d478dad2628bc159 Merge: d235e523d bebdd2888 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit b0bfee8c783b495ece772189d478dad2628bc159 Merge: d235e523d bebdd2888 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 13:37:20 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug32884 | 5 +++++ src/lib/thread/compat_pthreads.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0