March 2017 - tor-commits - lists.torproject.org

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Mar '17

06 Mar '17

commit 58295db16c6413c16684de491060dbc89c5010eb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 7 01:48:21 2017 +0000 Update translations for tor-browser-manual --- vi/vi.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index 4b920db..60d0ff3 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -119,7 +119,7 @@ msgstr "" #: bridges.page:6 msgid "Learn what bridges are and how to get them" -msgstr "" +msgstr "Tìm hiểu cầu nối là gì và làm thế nào để có được" #: bridges.page:10 msgid "Bridges" @@ -144,13 +144,15 @@ msgstr "" #: bridges.page:28 msgid "Getting bridge addresses" -msgstr "" +msgstr "Đang lấy địa chỉ cầu nối" #: bridges.page:29 msgid "" "Because bridge addresses are not public, you will need to request them " "yourself. You have two options:" msgstr "" +"Vì địa chỉ cầu nối không được công khai, bạn sẽ phải tự yêu cầu nó. Bạn có " +"hai tùy chọn:" #: bridges.page:36 msgid ""

1 0

[torspec/master] Add initial draft of #278: Directory Compression Scheme Negotiation
by ahf＠torproject.org 06 Mar '17

06 Mar '17

commit f7b9bca132a5fb6d62207d9065500f427ca7d27d Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Mar 7 00:20:30 2017 +0100 Add initial draft of #278: Directory Compression Scheme Negotiation --- proposals/000-index.txt | 2 + ...78-directory-compression-scheme-negotiation.txt | 188 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index c849377..e06845e 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -198,6 +198,7 @@ Proposals by number: 275 Stop including meaningful "published" time in microdescriptor consensus [OPEN] 276 Report bandwidth with lower granularity in consensus documents [OPEN] 277 Detect multiple relay instances running with same ID [OPEN] +278 Directory Compression Scheme Negotiation [DRAFT] Proposals by status: @@ -220,6 +221,7 @@ Proposals by status: 269 Transitionally secure hybrid handshakes 270 RebelAlliance: A Post-Quantum Secure Hybrid Handshake Based on NewHope 273 Exit relay pinning for web services [for n/a] + 278 Directory Compression Scheme Negotiation [for N/A] NEEDS-REVISION: 190 Bridge Client Authorization Based on a Shared Secret NEEDS-RESEARCH: diff --git a/proposals/278-directory-compression-scheme-negotiation.txt b/proposals/278-directory-compression-scheme-negotiation.txt new file mode 100644 index 0000000..4deef3e --- /dev/null +++ b/proposals/278-directory-compression-scheme-negotiation.txt @@ -0,0 +1,188 @@ +Filename: 278-directory-compression-scheme-negotiation.txt +Title: Directory Compression Scheme Negotiation +Author: Alexander Færøy +Created: 2017-03-06 +Status: Draft +Target: N/A + +0. Overview + + This document describes a method to provide and use different + compression schemes in Tor's directory specification[0] and let it be + up the client and server to negotiate a mutually supported scheme + using the semantics of the HTTP protocol. + + Furthermore this proposal also extends Tor's directory protocol with + support for the LZMA2 and Zstandard compression schemes. + +1. Motivation + + Currently Tor serves each directory client with its different document + flavours in either an uncompressed format or, if the client adds a + ".z"-suffix to the URL file path, a zlib-compressed document. + + This have historically been non-problematic, but it disallows us from + easily extending the set of supported compression schemes. + + Some of the problems this proposal is trying to aid: + + - We currently only support zlib-based compression schemes and there + is no way for directory servers or clients to announce which + compression schemes they support. Zlib might not be the ideal + compression scheme for all purposes. + + - It is not easily possible to add support for additional + compression schemes without adding additional file extensions or + flavours of the directory documents. + + - In low-bandwidth and/or low-memory client scenarios it is useful + to be able to limit the amount of supported compression schemes to + have a client only support the most efficient compression scheme + for the given use-case and have the directory servers support the + most commonly available compression schemes used throughout the + network. + + - We add support for the LZMA2 compression scheme, which yields + better compressed size and decompression time at the expensive of + higher compression time and higher memory usage. + + - We add support for the Zstandard compression scheme, which yields + better compression ratio than GZip, but slightly worse than LZMA2, + but with a smaller CPU and memory footprint than LZMA2. + +2. Analysis + + We investigated the compression ratio, memory usage, memory allocation + strategies, and execution time for compression and decompression of + the GZip, BZip2, LZMA2, and Zstandard compression schemes at + compression levels 1 through 9. + + The data used in this analysis can be found in [1] and the `bench` + tool for generating the data can be found in [2]. + + During the preparation for this proposal Nick have analysed + compressing consensus diffs using both GZip, LZMA2, and Zstandard. The + result of Nick's analysis can be found in [3]. + + We must continue to support both "gzip", "deflate", and "identity" + which are the currently available compression schemes in the Tor + network. + + Further to enhance the compression ratio Nick have also worked on + proposal #274 (Rotate onion keys less frequently), #275 (Stop + including meaningful "published" time in microdescriptor consensus), + #276 (Report bandwidth with lower granularity in consensus documents), + and #277 (Detect multiple relay instances running with same ID) which + all aid in making our consensus documents less dynamic. + +3. Proposal + + We extend the directory client requests to include the + "Accept-Encoding" header as part of its request. The "Accept-Encoding" + header should contain a comma-separated list of names of the + compression schemes of which the client supports. + + For example: + + GET / HTTP/1.0 + Accept-Encoding: zstd, xz, gzip, deflate + + When a directory server receives a request with the "Accept-Encoding" + header included it must decide on a mutually supported compression + scheme and add the "Content-Encoding" header to its response and thus + notifying the client of its decision. The "Content-Encoding" header + can at most contain one supported compression scheme. If no mutual + compression scheme can be negotiated the server must respond with an + HTTP error status code of 415 "Unsupported Media Type". + + For example: + + HTTP/1.0 200 OK + Content-Length: 1337 + Connection: close + Content-Encoding: zstd + + Currently supported compression scheme names includes "identity", + "gzip", and "deflate". This proposal adds two additional compression + scheme named "xz" (LZMA2) and "zstd" (Zstandard). + + All compression scheme names are case-insensitive. + + The "deflate", "gzip", and "identity" compression schemes must be + supported by directory servers for backwards compatibility. + + Additionally, when a client, that supports this proposals, makes a + request to a directory document with the ".z"-suffix it must send an + ordered set of supported compression schemes where the last elements + in the set contains compression schemes that are supported by all of + the currently available Tor nodes ("gzip", "deflate", "identity"). In + this way older relays will simply respond with the document compressed + using zlib deflate without any prior knowledge of the newly added + compression schemes. + + The "Content-Length" header contains the number of compressed bytes + sent to the client. + + The new compression schemes will be available for directory clients + over both clearnet and BEGIN_DIR-style connections. + +4. Security Implications + +4.1 Compression and Decompression Bombs + + We currently detect compression and decompression "bombs" and must + continue to do so with any additional compression schemes that we add. + + The detection of compression and decompression bombs are handled in + `is_compression_bomb()` in torgzip.c and the same functionality is + used both for compression and decompression. These functions must be + extended to support LZMA2 and Zstandard. + +4.2 Detection of Compression Algorithms + + To ensure that we do not pass compressed data through the incorrect + decompression handler, when we have received data from another peer, + Tor tries to detect the compression scheme in + `detect_compression_method()`` in torgzip.c. This function should be + extended to also detect the LZMA2 and Zstandard formats. Possible + methods of applying this detection is looking at xz-tools, zstd's CLI, + and the libmagic 'compress' module. + +4.3 Fingerprinting + + All clients should aim at supporting the same set of supported + compression schemes to avoid fingerprinting. + +5. Compatibility + + This proposal does not break any backwards compatibility. + + Tor will continue to support serving uncompressed and zlib-compressed + objects using the method defined in the directory specification[0], + but will allow newer clients to negotiate a mutually supported + compression scheme. + +6. Performance and Scalability + + Each newly added compression scheme adds to the compression cache of a + relay, which increases the memory requirements of a relay. + + The LZMA2 compression scheme yields better compression ratio at the + expense of higher memory and CPU requirements for compression and + slightly higher memory and CPU requirements for decompression. + + The Zstandard compression scheme yields better compression ratio than + GZip does, but does not suffer from the same high CPU and memory + requirements for compression as LZMA2 does. + + Because of the high requirements for CPU and memory usage for LZMA2 it + is possible that we do not support this scheme for all available + documents or that we only support it in situations where it is + possible to pre-compute and cache the compressed document. + +7. References + + [0]: https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt + [1]: https://docs.google.com/spreadsheets/d/1devQlUOzMPStqUl9mPawFWP99xSsRM8xWv7… + [2]: https://gitlab.com/ahf/tor-sponsor4-compression + [3]: https://github.com/nmathewson/consensus-diff-analysis

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Mar '17

06 Mar '17

commit 83e73f9d5c3764b0e9dfb3b0a52bbff3189fc137 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 6 20:18:26 2017 +0000 Update translations for tor-browser-manual --- pt/pt.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pt/pt.po b/pt/pt.po index aa33659..8520195 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -626,6 +626,11 @@ msgid "" "executable text files when they are opened\" to \"Ask every time\", then " "click OK." msgstr "" +"Para executar o Tor Browser no Ubuntu, os utilizadores precisam de executar " +"um script de shell. Abra \"Ficheiros\" (Explorador de unidade), abra " +"Preferências → Separador de Comportamento → Definir \"Executar ficheiros de " +"texto executáveis quando forem abertos\" para \"Pedir de todas as vezes\", " +"depois clique em OK." #: known-issues.page:62 msgid ""

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 06 Mar '17

06 Mar '17

commit fe8180dd342e8e825370149b8fefeef99a050ffe Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 6 20:16:09 2017 +0000 Update translations for tor-launcher-progress_completed --- pt/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/progress.dtd b/pt/progress.dtd index 6ed4a63..f3a6922 100644 --- a/pt/progress.dtd +++ b/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações"> <!ENTITY torprogress.heading "A conetar à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor aguarde enquanto estabelecemos a ligação à rede Tor.  Isto pode levar alguns minutos."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 06 Mar '17

06 Mar '17

commit 58ff7e1eab8a54bac896b6b9ea50fa424c67367d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 6 20:16:03 2017 +0000 Update translations for tor-launcher-progress --- pt/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/progress.dtd b/pt/progress.dtd index 6ed4a63..f3a6922 100644 --- a/pt/progress.dtd +++ b/pt/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Estado do Tor"> <!ENTITY torprogress.openSettings "Abrir Configurações"> <!ENTITY torprogress.heading "A conetar à rede Tor"> -<!ENTITY torprogress.pleaseWait "Por favor aguarde enquanto estabelecemos a ligação à rede Tor.  Isto pode levar alguns minutos."> +<!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos.">

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Mar '17

06 Mar '17

commit 7eede123ce656a9caca8beb653adea68129d20e0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 6 18:48:19 2017 +0000 Update translations for tor-browser-manual --- ru/ru.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ru/ru.po b/ru/ru.po index 8cc4b49..6b1f49a 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -1069,6 +1069,8 @@ msgid "" "Tor Browser is based on Firefox, and any browser add-ons or themes that are " "compatible with Firefox can also be installed in Tor Browser." msgstr "" +"Tor Browser базируется на Firefox и любые дополнения браузера или темы, " +"совместимые с Firefox, также могут быть установлены в Tor Browser." #: plugins.page:64 msgid "" @@ -1115,6 +1117,8 @@ msgid "" "The following visualization shows what information is visible to " "eavesdroppers with and without Tor Browser and HTTPS encryption:" msgstr "" +"Следующая визуализация показывает, какие сведения видны для прослушивания " +"без Tor Browser и HTTPS-шифрования:" #: secure-connections.page:35 msgid ""

1 0

[tor/master] Add compatibility function for fgets(3).
by nickm＠torproject.org 06 Mar '17

06 Mar '17

commit 498287b3c340739bede9a3fa95ea23b6ae650bf3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Feb 27 15:37:31 2017 +0100 Add compatibility function for fgets(3). This patch adds the `tor_fgets()` function to our compatibility layer. `tor_fgets()` adds an additional check for whether the error-bit have been enabled for the given file stream, if that is the case and `errno` is set to `EAGAIN` we make sure that we always return NULL. Unfortunately `fgets(3)` behaves differently on different versions of the C library. See: https://bugs.torproject.org/21416 See: https://bugs.torproject.org/20988 --- changes/bug20988 | 4 ++++ src/common/compat.c | 39 +++++++++++++++++++++++++++++++++++++++ src/common/compat.h | 2 ++ 3 files changed, 45 insertions(+) diff --git a/changes/bug20988 b/changes/bug20988 new file mode 100644 index 0000000..b1d73f0 --- /dev/null +++ b/changes/bug20988 @@ -0,0 +1,4 @@ + o Minor bugfixes (portability): + - Add Tor compatibility function for fgets(3) due to inconsistency of + returned values in different supported C libraries. This fixes unit test + failures reported on FreeBSD. Fixes bug 20988. diff --git a/src/common/compat.c b/src/common/compat.c index 0dbede6..da4283f 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3476,6 +3476,45 @@ tor_getpass(const char *prompt, char *output, size_t buflen) #endif } +/** Read at most one less than the number of characters specified by + * size from the given stream and store it in str. + * + * Reading stops when a newline character is found or at EOF or error. If any + * characters are read and there's no error, a trailing NUL byte is appended to + * the end of str. + * + * Upon successful completion, this function returns a pointer to the string + * str. If EOF occurs before any characters are read the function will + * return NULL and the content of str is unchanged. Upon error, the + * function returns NULL and the caller must check for error using foef(3) and + * ferror(3). + */ +char * +tor_fgets(char *str, int size, FILE *stream) +{ + char *ret; + + /* Reset errno before our call to fgets(3) to avoid a situation where the + * caller is calling us again because we just returned NULL and errno == + * EAGAIN, but when they call us again we will always return NULL because the + * error flag on the file handler remains set and errno is set to EAGAIN. + */ + errno = 0; + + ret = fgets(str, size, stream); + + /* FreeBSD, OpenBSD, Linux (glibc), and Linux (musl) seem to disagree about + * what to do in the given situation. We check if the stream has been flagged + * with an error-bit and return NULL in that situation if errno is also set + * to EAGAIN. + */ + if (ferror(stream) && errno == EAGAIN) { + return NULL; + } + + return ret; +} + /** Return the amount of free disk space we have permission to use, in * bytes. Return -1 if the amount of free space can't be determined. */ int64_t diff --git a/src/common/compat.h b/src/common/compat.h index ee1c945..1f51ece 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -740,6 +740,8 @@ STATIC int tor_ersatz_socketpair(int family, int type, int protocol, ssize_t tor_getpass(const char *prompt, char *output, size_t buflen); +char *tor_fgets(char *str, int size, FILE *stream); + /* This needs some of the declarations above so we include it here. */ #include "compat_threads.h"

1 0

[tor/master] Reset `buf` after each succesful test to avoid artifacts.
by nickm＠torproject.org 06 Mar '17

06 Mar '17

commit ae91e64fa846d2861a6627fbd018665840fd7dd7 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Feb 27 15:57:08 2017 +0100 Reset `buf` after each succesful test to avoid artifacts. This patch resets `buf` in test_util_fgets_eagain() after each succesful ivocation to avoid stray artifacts left in the buffer by erroneous tor_fgets() calls. --- src/test/test_util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 7a69916..3e4d45d 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3986,6 +3986,7 @@ test_util_fgets_eagain(void *ptr) tt_ptr_op(retptr, OP_EQ, buf); tt_str_op(buf, OP_EQ, "B\n"); errno = 0; + memset(buf, '\0', sizeof(buf)); /* Send in a full line */ retlen = write(test_pipe[1], "CD\n", 3); @@ -3995,6 +3996,7 @@ test_util_fgets_eagain(void *ptr) tt_ptr_op(retptr, OP_EQ, buf); tt_str_op(buf, OP_EQ, "CD\n"); errno = 0; + memset(buf, '\0', sizeof(buf)); /* Send in a partial line */ retlen = write(test_pipe[1], "E", 1); @@ -4013,6 +4015,7 @@ test_util_fgets_eagain(void *ptr) tt_ptr_op(retptr, OP_EQ, buf); tt_str_op(buf, OP_EQ, "F\n"); errno = 0; + memset(buf, '\0', sizeof(buf)); /* Send in a full line and close */ retlen = write(test_pipe[1], "GH", 2); @@ -4036,6 +4039,7 @@ test_util_fgets_eagain(void *ptr) /* Check that buf is unchanged according to C99 and C11 */ tt_str_op(buf, OP_EQ, "GH"); + memset(buf, '\0', sizeof(buf)); done: if (test_stream != NULL)

1 0

[tor/master] Merge remote-tracking branch 'ahf/bugs/20988'
by nickm＠torproject.org 06 Mar '17

06 Mar '17

commit 88b91d775345037f1d743ecc4d7d392b15d501bb Merge: 2c8d2ca ae91e64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 6 12:04:58 2017 -0500 Merge remote-tracking branch 'ahf/bugs/20988' changes/bug20988 | 4 ++++ src/common/compat.c | 39 +++++++++++++++++++++++++++++++++++++++ src/common/compat.h | 2 ++ src/common/util.c | 4 ++-- src/or/dirserv.c | 4 ++-- src/or/geoip.c | 2 +- src/test/test_util.c | 22 +++++++++++++--------- 7 files changed, 63 insertions(+), 14 deletions(-)

1 0

[tor/master] Use tor_fgets() instead of fgets().
by nickm＠torproject.org 06 Mar '17

06 Mar '17

commit 3dca5a6e71929f88c9c76f6ebbaac58789884b6e Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Feb 27 15:42:57 2017 +0100 Use tor_fgets() instead of fgets(). This patch changes our use of fgets() to tor_fgets() for more consistent error handling across different versions of the C library. --- src/common/util.c | 4 ++-- src/or/dirserv.c | 4 ++-- src/or/geoip.c | 2 +- src/test/test_util.c | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index f980fa2..a69d887 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5020,7 +5020,7 @@ tor_read_all_handle(FILE *h, char *buf, size_t count, while (numread != count) { /* Use fgets because that is what we use in log_from_pipe() */ - retval = fgets(buf+numread, (int)(count-numread), h); + retval = tor_fgets(buf+numread, (int)(count-numread), h); if (NULL == retval) { if (feof(h)) { log_debug(LD_GENERAL, "fgets() reached end of file"); @@ -5355,7 +5355,7 @@ get_string_from_pipe(FILE *stream, char *buf_out, size_t count) tor_assert(count <= INT_MAX); - retval = fgets(buf_out, (int)count, stream); + retval = tor_fgets(buf_out, (int)count, stream); if (!retval) { if (feof(stream)) { diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f01668a..2c3ce10 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2701,7 +2701,7 @@ dirserv_read_measured_bandwidths(const char *from_file, return -1; } - if (!fgets(line, sizeof(line), fp) + if (!tor_fgets(line, sizeof(line), fp) || !strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); @@ -2731,7 +2731,7 @@ dirserv_read_measured_bandwidths(const char *from_file, while (!feof(fp)) { measured_bw_line_t parsed_line; - if (fgets(line, sizeof(line), fp) && strlen(line)) { + if (tor_fgets(line, sizeof(line), fp) && strlen(line)) { if (measured_bw_line_parse(&parsed_line, line) != -1) { /* Also cache the line for dirserv_get_bandwidth_for_router() */ dirserv_cache_measured_bw(&parsed_line, file_time); diff --git a/src/or/geoip.c b/src/or/geoip.c index 74811ea..a8dc807 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -346,7 +346,7 @@ geoip_load_file(sa_family_t family, const char *filename) (family == AF_INET) ? "IPv4" : "IPv6", filename); while (!feof(f)) { char buf[512]; - if (fgets(buf, (int)sizeof(buf), f) == NULL) + if (tor_fgets(buf, (int)sizeof(buf), f) == NULL) break; crypto_digest_add_bytes(geoip_digest_env, buf, strlen(buf)); /* FFFF track full country name. */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 5b4d5b7..7a69916 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3972,16 +3972,16 @@ test_util_fgets_eagain(void *ptr) /* Send in a partial line */ retlen = write(test_pipe[1], "A", 1); tt_int_op(retlen, OP_EQ, 1); - retptr = fgets(buf, sizeof(buf), test_stream); + retptr = tor_fgets(buf, sizeof(buf), test_stream); tt_int_op(errno, OP_EQ, EAGAIN); - tt_ptr_op(retptr, OP_EQ, buf); + tt_ptr_op(retptr, OP_EQ, NULL); tt_str_op(buf, OP_EQ, "A"); errno = 0; /* Send in the rest */ retlen = write(test_pipe[1], "B\n", 2); tt_int_op(retlen, OP_EQ, 2); - retptr = fgets(buf, sizeof(buf), test_stream); + retptr = tor_fgets(buf, sizeof(buf), test_stream); tt_int_op(errno, OP_EQ, 0); tt_ptr_op(retptr, OP_EQ, buf); tt_str_op(buf, OP_EQ, "B\n"); @@ -3990,7 +3990,7 @@ test_util_fgets_eagain(void *ptr) /* Send in a full line */ retlen = write(test_pipe[1], "CD\n", 3); tt_int_op(retlen, OP_EQ, 3); - retptr = fgets(buf, sizeof(buf), test_stream); + retptr = tor_fgets(buf, sizeof(buf), test_stream); tt_int_op(errno, OP_EQ, 0); tt_ptr_op(retptr, OP_EQ, buf); tt_str_op(buf, OP_EQ, "CD\n"); @@ -3999,16 +3999,16 @@ test_util_fgets_eagain(void *ptr) /* Send in a partial line */ retlen = write(test_pipe[1], "E", 1); tt_int_op(retlen, OP_EQ, 1); - retptr = fgets(buf, sizeof(buf), test_stream); + retptr = tor_fgets(buf, sizeof(buf), test_stream); tt_int_op(errno, OP_EQ, EAGAIN); - tt_ptr_op(retptr, OP_EQ, buf); + tt_ptr_op(retptr, OP_EQ, NULL); tt_str_op(buf, OP_EQ, "E"); errno = 0; /* Send in the rest */ retlen = write(test_pipe[1], "F\n", 2); tt_int_op(retlen, OP_EQ, 2); - retptr = fgets(buf, sizeof(buf), test_stream); + retptr = tor_fgets(buf, sizeof(buf), test_stream); tt_int_op(errno, OP_EQ, 0); tt_ptr_op(retptr, OP_EQ, buf); tt_str_op(buf, OP_EQ, "F\n"); @@ -4020,14 +4020,14 @@ test_util_fgets_eagain(void *ptr) retval = close(test_pipe[1]); tt_int_op(retval, OP_EQ, 0); test_pipe[1] = -1; - retptr = fgets(buf, sizeof(buf), test_stream); + retptr = tor_fgets(buf, sizeof(buf), test_stream); tt_int_op(errno, OP_EQ, 0); tt_ptr_op(retptr, OP_EQ, buf); tt_str_op(buf, OP_EQ, "GH"); errno = 0; /* Check for EOF */ - retptr = fgets(buf, sizeof(buf), test_stream); + retptr = tor_fgets(buf, sizeof(buf), test_stream); tt_int_op(errno, OP_EQ, 0); tt_ptr_op(retptr, OP_EQ, NULL); retval = feof(test_stream);

1 0