tor-commits October 2015

tor-commits@lists.torproject.org

14 participants
1182 discussions

[tor/master] Fix style and compilation in log_test_helpers
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit c01f9d9ffe03d5c46833df477fcf2a4bd36dd389 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 13:03:43 2015 +0200 Fix style and compilation in log_test_helpers --- src/test/log_test_helpers.c | 37 +++++++++++++++++++++++++------------ src/test/log_test_helpers.h | 7 +++++-- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 42778d4..925f0f1 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -33,8 +33,8 @@ mock_clean_saved_logs(void) saved_logs = NULL; } -char * -mock_saved_log_at(int ix) +static mock_saved_log_entry_t * +mock_get_log_entry(int ix) { int saved_log_count = mock_saved_log_number(); if(ix < 0) { @@ -42,21 +42,29 @@ mock_saved_log_at(int ix) } if (saved_log_count <= ix) + return NULL; + + return smartlist_get(saved_logs, ix); +} + +const char * +mock_saved_log_at(int ix) +{ + mock_saved_log_entry_t *ent = mock_get_log_entry(ix); + if (ent) + return ent->generated_msg; + else return ""; - return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->generated_msg; } int mock_saved_severity_at(int ix) { - int saved_log_count = mock_saved_log_number(); - if(ix < 0) { - ix = saved_log_count + ix; - } - - if (saved_log_count <= ix) + mock_saved_log_entry_t *ent = mock_get_log_entry(ix); + if (ent) + return ent->severity; + else return -1; - return ((mock_saved_log_entry_t *)smartlist_get(saved_logs, ix))->severity; } int @@ -74,11 +82,15 @@ mock_saved_logs(void) } void -mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap) +mock_saving_logv(int severity, log_domain_mask_t domain, + const char *funcname, const char *suffix, + const char *format, va_list ap) { + (void)domain; char *buf = tor_malloc_zero(10240); int n; n = tor_vsnprintf(buf,10240,format,ap); + tor_assert(n < 10240-1); buf[n]='\n'; buf[n+1]='\0'; @@ -87,7 +99,8 @@ mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, c e->funcname = funcname; e->suffix = suffix; e->format = format; - e->generated_msg = buf; + e->generated_msg = tor_strdup(buf); + tor_free(buf); if (!saved_logs) saved_logs = smartlist_new(); diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 789bfe4..4822ce5 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -15,12 +15,15 @@ typedef struct mock_saved_log_entry_t { struct mock_saved_log_entry_t *next; } mock_saved_log_entry_t; -void mock_saving_logv(int severity, log_domain_mask_t domain, const char *funcname, const char *suffix, const char *format, va_list ap); +void mock_saving_logv(int severity, log_domain_mask_t domain, + const char *funcname, const char *suffix, + const char *format, va_list ap) + CHECK_PRINTF(5, 0); void mock_clean_saved_logs(void); const smartlist_t *mock_saved_logs(void); int setup_capture_of_logs(int new_level); void teardown_capture_of_logs(int prev); -char *mock_saved_log_at(int ix); +const char *mock_saved_log_at(int ix); int mock_saved_severity_at(int ix); int mock_saved_log_number(void);

1 0

[tor/master] Add tests for util_format
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 28370fe77fcb8aae275883280679d0f7bc030496 Author: Ola Bini <ola(a)olabini.se> Date: Tue Sep 15 17:40:16 2015 +0200 Add tests for util_format --- src/test/include.am | 1 + src/test/test.c | 3 +- src/test/test_util_format.c | 197 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 1 deletion(-) diff --git a/src/test/include.am b/src/test/include.am index f7c0204..762216e 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -96,6 +96,7 @@ src_test_test_SOURCES = \ src/test/test_status.c \ src/test/test_threads.c \ src/test/test_util.c \ + src/test/test_util_format.c \ src/test/test_helpers.c \ src/test/test_dns.c \ src/test/testing_common.c \ diff --git a/src/test/test.c b/src/test/test.c index e10e260..aff7d8e 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1158,6 +1158,7 @@ extern struct testcase_t socks_tests[]; extern struct testcase_t status_tests[]; extern struct testcase_t thread_tests[]; extern struct testcase_t util_tests[]; +extern struct testcase_t util_format_tests[]; extern struct testcase_t dns_tests[]; struct testgroup_t testgroups[] = { @@ -1203,9 +1204,9 @@ struct testgroup_t testgroups[] = { { "socks/", socks_tests }, { "status/" , status_tests }, { "util/", util_tests }, + { "util/format/", util_format_tests }, { "util/logging/", logging_tests }, { "util/thread/", thread_tests }, { "dns/", dns_tests }, END_OF_GROUPS }; - diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c new file mode 100644 index 0000000..8ffc2de --- /dev/null +++ b/src/test/test_util_format.c @@ -0,0 +1,197 @@ +/* Copyright (c) 2010-2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#include "or.h" + +#include "test.h" + +#define UTIL_FORMAT_PRIVATE +#include "util_format.h" + +#define NS_MODULE util_format + +static void +test_util_format_base64_encode(void *ignored) +{ + (void)ignored; + int res; + int i; + char *src; + char *dst; + + src = tor_malloc_zero(256); + dst = tor_malloc_zero(1000); + + for(i=0;i<256;i++) { + src[i] = (char)i; + } + + res = base64_encode(NULL, 1, src, 1, 0); + tt_int_op(res, OP_EQ, -1); + + res = base64_encode(dst, 1, NULL, 1, 0); + tt_int_op(res, OP_EQ, -1); + + res = base64_encode(dst, 1, src, 10, 0); + tt_int_op(res, OP_EQ, -1); + + res = base64_encode(dst, SSIZE_MAX-1, src, 1, 0); + tt_int_op(res, OP_EQ, -1); + + res = base64_encode(dst, SSIZE_MAX-1, src, 10, 0); + tt_int_op(res, OP_EQ, -1); + + res = base64_encode(dst, 1000, src, 256, 0); + tt_int_op(res, OP_EQ, 344); + tt_str_op(dst, OP_EQ, "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="); + + + res = base64_encode(dst, 1000, src, 256, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 350); + tt_str_op(dst, OP_EQ, "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4v\n" + "MDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5f\n" + "YGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6P\n" + "kJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/\n" + "wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v\n" + "8PHy8/T19vf4+fr7/P3+/w==\n"); + + res = base64_encode(dst, 1000, src+1, 255, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 346); + + for(i = 0;i<50;i++) { + src[i] = 0; + } + src[50] = 255; + src[51] = 255; + src[52] = 255; + src[53] = 255; + + res = base64_encode(dst, 1000, src, 54, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 74); + + res = base64_encode(dst, 1000, src+1, 53, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 74); + + res = base64_encode(dst, 1000, src+2, 52, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 74); + + res = base64_encode(dst, 1000, src+3, 51, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 70); + + res = base64_encode(dst, 1000, src+4, 50, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 70); + + res = base64_encode(dst, 1000, src+5, 49, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 70); + + res = base64_encode(dst, 1000, src+6, 48, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 65); + + res = base64_encode(dst, 1000, src+7, 47, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 65); + + res = base64_encode(dst, 1000, src+8, 46, BASE64_ENCODE_MULTILINE); + tt_int_op(res, OP_EQ, 65); + + + done: + tor_free(src); + tor_free(dst); +} + +static void +test_util_format_base64_decode_nopad(void *ignored) +{ + (void)ignored; + int res; + int i; + char *src; + uint8_t *dst; + + src = tor_malloc_zero(256); + dst = tor_malloc_zero(1000); + + for(i=0;i<256;i++) { + src[i] = (char)i; + } + + res = base64_decode_nopad(dst, 1, src, SIZE_T_CEILING); + tt_int_op(res, OP_EQ, -1); + + res = base64_decode_nopad(dst, 1, src, 5); + tt_int_op(res, OP_EQ, -1); + + done: + tor_free(src); + tor_free(dst); +} + + +static void +test_util_format_base64_decode(void *ignored) +{ + (void)ignored; + int res; + int i; + char *src; + char *dst; + + src = tor_malloc_zero(256); + dst = tor_malloc_zero(1000); + + for(i=0;i<256;i++) { + src[i] = (char)i; + } + + res = base64_decode(dst, 1, src, SIZE_T_CEILING); + tt_int_op(res, OP_EQ, -1); + + res = base64_decode(dst, SIZE_T_CEILING+1, src, 10); + tt_int_op(res, OP_EQ, -1); + + done: + tor_free(src); + tor_free(dst); +} + + + +static void +test_util_format_base16_decode(void *ignored) +{ + (void)ignored; + int res; + int i; + char *src; + char *dst; + + src = tor_malloc_zero(256); + dst = tor_malloc_zero(1000); + + for(i=0;i<256;i++) { + src[i] = (char)i; + } + + res = base16_decode(dst, 3, src, 3); + tt_int_op(res, OP_EQ, -1); + + res = base16_decode(dst, 1, src, 10); + tt_int_op(res, OP_EQ, -1); + + res = base16_decode(dst, SIZE_T_CEILING+2, src, 10); + tt_int_op(res, OP_EQ, -1); + + done: + tor_free(src); + tor_free(dst); +} + + +struct testcase_t util_format_tests[] = { + { "base64_encode", test_util_format_base64_encode, 0, NULL, NULL }, + { "base64_decode_nopad", test_util_format_base64_decode_nopad, 0, NULL, NULL }, + { "base64_decode", test_util_format_base64_decode, 0, NULL, NULL }, + { "base16_decode", test_util_format_base16_decode, 0, NULL, NULL }, + END_OF_TESTCASES +};

1 0

[tor/master] Merge remote-tracking branch 'twstrike/util_format_tests'
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 3321e4a0254bdaa023dd961cda6ba6636a67c879 Merge: 596de49 28370fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 12:40:30 2015 +0200 Merge remote-tracking branch 'twstrike/util_format_tests' src/test/include.am | 1 + src/test/test.c | 3 +- src/test/test_util_format.c | 197 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 1 deletion(-)

1 0

[tor/master] Give test_util_format some succeeding test cases
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 39eb075c20991e10df394e8f40ef56d16b9935c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 12:52:35 2015 +0200 Give test_util_format some succeeding test cases --- src/test/test_util_format.c | 44 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index c7d1047..af4997d 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -121,14 +121,22 @@ test_util_format_base64_decode_nopad(void *ignored) src[i] = (char)i; } - /* XXXX Needs to test the success case */ - res = base64_decode_nopad(dst, 1, src, SIZE_T_CEILING); tt_int_op(res, OP_EQ, -1); res = base64_decode_nopad(dst, 1, src, 5); tt_int_op(res, OP_EQ, -1); + const char *s = "SGVsbG8gd29ybGQ"; + res = base64_decode_nopad(dst, 1000, s, strlen(s)); + tt_int_op(res, OP_EQ, 11); + tt_mem_op(dst, OP_EQ, "Hello world", 11); + + s = "T3BhIG11bmRv"; + res = base64_decode_nopad(dst, 9, s, strlen(s)); + tt_int_op(res, OP_EQ, 9); + tt_mem_op(dst, OP_EQ, "Opa mundo", 9); + done: tor_free(src); tor_free(dst); @@ -150,14 +158,27 @@ test_util_format_base64_decode(void *ignored) src[i] = (char)i; } - /* XXXX Needs to test the success case */ - res = base64_decode(dst, 1, src, SIZE_T_CEILING); tt_int_op(res, OP_EQ, -1); res = base64_decode(dst, SIZE_T_CEILING+1, src, 10); tt_int_op(res, OP_EQ, -1); + const char *s = "T3BhIG11bmRv"; + res = base64_decode(dst, 9, s, strlen(s)); + tt_int_op(res, OP_EQ, 9); + tt_mem_op(dst, OP_EQ, "Opa mundo", 9); + + memset(dst, 0, 1000); + res = base64_decode(dst, 100, s, strlen(s)); + tt_int_op(res, OP_EQ, 9); + tt_mem_op(dst, OP_EQ, "Opa mundo", 9); + + s = "SGVsbG8gd29ybGQ="; + res = base64_decode(dst, 100, s, strlen(s)); + tt_int_op(res, OP_EQ, 11); + tt_mem_op(dst, OP_EQ, "Hello world", 11); + done: tor_free(src); tor_free(dst); @@ -179,8 +200,6 @@ test_util_format_base16_decode(void *ignored) src[i] = (char)i; } - /* XXXX Needs to test the success case */ - res = base16_decode(dst, 3, src, 3); tt_int_op(res, OP_EQ, -1); @@ -190,6 +209,19 @@ test_util_format_base16_decode(void *ignored) res = base16_decode(dst, SIZE_T_CEILING+2, src, 10); tt_int_op(res, OP_EQ, -1); + res = base16_decode(dst, 1000, "", 0); + tt_int_op(res, OP_EQ, 0); + + res = base16_decode(dst, 1000, "aabc", 4); + tt_int_op(res, OP_EQ, 0); + tt_mem_op(dst, OP_EQ, "\xaa\xbc", 2); + + res = base16_decode(dst, 1000, "aabcd", 6); + tt_int_op(res, OP_EQ, -1); + + res = base16_decode(dst, 1000, "axxx", 4); + tt_int_op(res, OP_EQ, -1); + done: tor_free(src); tor_free(dst);

1 0

[tor/master] Add notes and whitespace fixes to test_util_format
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 144a0cb70452fd934a3f9ec6533c829d9379e0f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 2 12:44:35 2015 +0200 Add notes and whitespace fixes to test_util_format --- src/test/test_util_format.c | 47 ++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/test/test_util_format.c b/src/test/test_util_format.c index 8ffc2de..c7d1047 100644 --- a/src/test/test_util_format.c +++ b/src/test/test_util_format.c @@ -23,7 +23,7 @@ test_util_format_base64_encode(void *ignored) src = tor_malloc_zero(256); dst = tor_malloc_zero(1000); - for(i=0;i<256;i++) { + for (i=0;i<256;i++) { src[i] = (char)i; } @@ -44,22 +44,28 @@ test_util_format_base64_encode(void *ignored) res = base64_encode(dst, 1000, src, 256, 0); tt_int_op(res, OP_EQ, 344); - tt_str_op(dst, OP_EQ, "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="); - + tt_str_op(dst, OP_EQ, "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh" + "8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZH" + "SElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3" + "BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeY" + "mZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wM" + "HCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp" + "6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="); res = base64_encode(dst, 1000, src, 256, BASE64_ENCODE_MULTILINE); tt_int_op(res, OP_EQ, 350); - tt_str_op(dst, OP_EQ, "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4v\n" - "MDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5f\n" - "YGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6P\n" - "kJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/\n" - "wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v\n" - "8PHy8/T19vf4+fr7/P3+/w==\n"); + tt_str_op(dst, OP_EQ, + "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4v\n" + "MDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5f\n" + "YGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6P\n" + "kJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/\n" + "wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v\n" + "8PHy8/T19vf4+fr7/P3+/w==\n"); res = base64_encode(dst, 1000, src+1, 255, BASE64_ENCODE_MULTILINE); tt_int_op(res, OP_EQ, 346); - for(i = 0;i<50;i++) { + for (i = 0;i<50;i++) { src[i] = 0; } src[50] = 255; @@ -94,7 +100,6 @@ test_util_format_base64_encode(void *ignored) res = base64_encode(dst, 1000, src+8, 46, BASE64_ENCODE_MULTILINE); tt_int_op(res, OP_EQ, 65); - done: tor_free(src); tor_free(dst); @@ -112,10 +117,12 @@ test_util_format_base64_decode_nopad(void *ignored) src = tor_malloc_zero(256); dst = tor_malloc_zero(1000); - for(i=0;i<256;i++) { + for (i=0;i<256;i++) { src[i] = (char)i; } + /* XXXX Needs to test the success case */ + res = base64_decode_nopad(dst, 1, src, SIZE_T_CEILING); tt_int_op(res, OP_EQ, -1); @@ -127,7 +134,6 @@ test_util_format_base64_decode_nopad(void *ignored) tor_free(dst); } - static void test_util_format_base64_decode(void *ignored) { @@ -140,10 +146,12 @@ test_util_format_base64_decode(void *ignored) src = tor_malloc_zero(256); dst = tor_malloc_zero(1000); - for(i=0;i<256;i++) { + for (i=0;i<256;i++) { src[i] = (char)i; } + /* XXXX Needs to test the success case */ + res = base64_decode(dst, 1, src, SIZE_T_CEILING); tt_int_op(res, OP_EQ, -1); @@ -155,8 +163,6 @@ test_util_format_base64_decode(void *ignored) tor_free(dst); } - - static void test_util_format_base16_decode(void *ignored) { @@ -169,10 +175,12 @@ test_util_format_base16_decode(void *ignored) src = tor_malloc_zero(256); dst = tor_malloc_zero(1000); - for(i=0;i<256;i++) { + for (i=0;i<256;i++) { src[i] = (char)i; } + /* XXXX Needs to test the success case */ + res = base16_decode(dst, 3, src, 3); tt_int_op(res, OP_EQ, -1); @@ -187,11 +195,12 @@ test_util_format_base16_decode(void *ignored) tor_free(dst); } - struct testcase_t util_format_tests[] = { { "base64_encode", test_util_format_base64_encode, 0, NULL, NULL }, - { "base64_decode_nopad", test_util_format_base64_decode_nopad, 0, NULL, NULL }, + { "base64_decode_nopad", test_util_format_base64_decode_nopad, 0, + NULL, NULL }, { "base64_decode", test_util_format_base64_decode, 0, NULL, NULL }, { "base16_decode", test_util_format_base16_decode, 0, NULL, NULL }, END_OF_TESTCASES }; +

1 0

[tor-commits] [translation/tor-messenger-conversationsproperties_completed] Update translations for tor-messenger-conversationsproperties_completed
by translation＠torproject.org 02 Oct '15

02 Oct '15

commit 584e007a7b3d63d79959dbdb69672213acb12c35 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 2 10:46:25 2015 +0000 Update translations for tor-messenger-conversationsproperties_completed --- uk/conversations.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/uk/conversations.properties b/uk/conversations.properties index eea2b1f..b96a157 100644 --- a/uk/conversations.properties +++ b/uk/conversations.properties @@ -56,6 +56,17 @@ topicChanged=%1$S змінив тему на: %2$S. # %1$S is the user who cleared the topic. topicCleared=%1$S очистив тему. +# LOCALIZATION NOTE (nickSet): +# This is displayed as a system message when a participant changes his/her +# nickname in a conversation. +# %1$S is the old nick. +# %2$S is the new nick. +nickSet=%1$S тепер відомий як %2$S. +# LOCALIZATION NOTE (nickSet.you): +# This is displayed as a system message when your nickname is changed. +# %S is your new nick. +nickSet.you=Тепер Ви відомі як %S. + # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut messenger.conversations.selections.ellipsis=[…]

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 02 Oct '15

02 Oct '15

commit 14ba43196fde79921d9650286724e91cff9038c3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 2 10:46:21 2015 +0000 Update translations for tor-messenger-conversationsproperties --- uk/conversations.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uk/conversations.properties b/uk/conversations.properties index b9be4fb..b96a157 100644 --- a/uk/conversations.properties +++ b/uk/conversations.properties @@ -61,11 +61,11 @@ topicCleared=%1$S очистив тему. # nickname in a conversation. # %1$S is the old nick. # %2$S is the new nick. -nickSet=%1$S is now known as %2$S. +nickSet=%1$S тепер відомий як %2$S. # LOCALIZATION NOTE (nickSet.you): # This is displayed as a system message when your nickname is changed. # %S is your new nick. -nickSet.you=You are now known as %S. +nickSet.you=Тепер Ви відомі як %S. # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis): # ellipsis is used when copying a part of a message to show that the message was cut

1 0

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

02 Oct '15

commit 8382f3980b5fd12a8b79df16646399477cac65e3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 2 10:45:43 2015 +0000 Update translations for tails-misc_completed --- uk.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/uk.po b/uk.po index 6782e9f..876def8 100644 --- a/uk.po +++ b/uk.po @@ -7,6 +7,7 @@ # LinuxChata, 2014 # Oleksii Golub <sclub2018(a)yandex.ua>, 2015 # Pinro Lomil <lomil97(a)gmail.com>, 2013 +# Vira Motorko <ato4ka(a)i.ua>, 2015 # Yasha <yasha88888(a)hotmail.com>, 2015 # Андрій Бандура <andriykopanytsia(a)gmail.com>, 2014 # Владислав <vladyslavpoghrebniakov(a)gmail.com>, 2014 @@ -14,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-28 01:49+0200\n" -"PO-Revision-Date: 2015-09-17 10:45+0000\n" -"Last-Translator: Yasha <yasha88888(a)hotmail.com>\n" +"POT-Creation-Date: 2015-09-20 19:32+0200\n" +"PO-Revision-Date: 2015-10-02 10:38+0000\n" +"Last-Translator: Vira Motorko <ato4ka(a)i.ua>\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -315,23 +316,23 @@ msgstr "Здається, ви заблоковані у мережі. Можл msgid "This version of Tails has known security issues:" msgstr "Ця версія Tails має відомі проблеми безпеки:" -#: 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 "Мережева карта ${nic} відключена" -#: 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 "Підміна MAC-адреси не вдалася для мережевої карти ${nic_name} (${nic}), тому вона тимчасово вимкнена. Можливо, ви віддасте перевагу перевантаженню Tails і вимкненню підміни MAC. Див. <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>документацію</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 "Всі налаштування мережі вимкнені" -#: 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" @@ -477,8 +478,8 @@ msgid "I2P's router console is ready" msgstr "I2P консоль маршрутизатора готова" #: 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 "Тепер ви можете отримати доступ до консолі маршрутизатора I2P по адресу http://127.0.0.1:7657." +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "Тепер ви можете отримати доступ до консолі маршрутизатора I2P у браузері I2P." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 msgid "I2P is not ready" @@ -486,10 +487,10 @@ msgstr "I2P не готовий" #: 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 "Eepsite тунель не був створений протягом шести хвилин. Перевірте консоль маршрутизатора за адресою http://127.0.0.1:7657/logs або журнали в /var/log/i2p для отримання додаткової інформації. Відключіться і підключіться до мережі, щоб спробувати знову." +"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 "Eepsite тунель не був створений протягом шести хвилин. Перевірте консоль маршрутизатора у браузері I2P або журнали в /var/log/i2p для отримання додаткової інформації. Відключіться і підключіться до мережі, щоб спробувати знову." #: 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 02 Oct '15

02 Oct '15

commit 58f858e84bdc6d6872850ccee3779fd88508dbfc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 2 10:45:38 2015 +0000 Update translations for tails-misc --- uk.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/uk.po b/uk.po index c184327..876def8 100644 --- a/uk.po +++ b/uk.po @@ -7,6 +7,7 @@ # LinuxChata, 2014 # Oleksii Golub <sclub2018(a)yandex.ua>, 2015 # Pinro Lomil <lomil97(a)gmail.com>, 2013 +# Vira Motorko <ato4ka(a)i.ua>, 2015 # Yasha <yasha88888(a)hotmail.com>, 2015 # Андрій Бандура <andriykopanytsia(a)gmail.com>, 2014 # Владислав <vladyslavpoghrebniakov(a)gmail.com>, 2014 @@ -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-10-02 10:38+0000\n" +"Last-Translator: Vira Motorko <ato4ka(a)i.ua>\n" "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -478,7 +479,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" @@ -489,7 +490,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 "Eepsite тунель не був створений протягом шести хвилин. Перевірте консоль маршрутизатора у браузері I2P або журнали в /var/log/i2p для отримання додаткової інформації. Відключіться і підключіться до мережі, щоб спробувати знову." #: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 msgid "I2P is ready"

1 0

[tor/master] Ignore OS X .DS_Store files
by nickm＠torproject.org 02 Oct '15

02 Oct '15

commit 596de490076f8a2585e6c31aca0455bf7ccdc3b5 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Oct 2 10:51:53 2015 +0200 Ignore OS X .DS_Store files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 135df7b..c1dff8b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ cscope.* # OSX junk *.dSYM +.DS_Store # / /Makefile

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2015