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

[tor/master] Re-run gen_server_ciphers
by nickm＠torproject.org 27 Jan '17

27 Jan '17

commit 363be43df36faa631fe0a49239e27489db466dc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 24 15:30:35 2017 -0500 Re-run gen_server_ciphers --- changes/server_cipher | 3 +++ src/common/tortls.c | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/changes/server_cipher b/changes/server_cipher new file mode 100644 index 0000000..b80c88a --- /dev/null +++ b/changes/server_cipher @@ -0,0 +1,3 @@ + o Minor features (ciphersuite choices): + - Allow servers to accept a wider range of ciphersuites, including + chacha20-poly1305 and AES-CCM. Closes the other part of 15426. diff --git a/src/common/tortls.c b/src/common/tortls.c index 2efb3ba..1fe91ed 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -585,6 +585,12 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] = #ifdef TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256 TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256 ":" #endif +#ifdef TLS1_TXT_DHE_RSA_WITH_AES_256_CCM + TLS1_TXT_DHE_RSA_WITH_AES_256_CCM ":" +#endif +#ifdef TLS1_TXT_DHE_RSA_WITH_AES_128_CCM + TLS1_TXT_DHE_RSA_WITH_AES_128_CCM ":" +#endif #ifdef TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256 TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256 ":" #endif @@ -594,8 +600,14 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] = /* Required */ TLS1_TXT_DHE_RSA_WITH_AES_256_SHA ":" /* Required */ - TLS1_TXT_DHE_RSA_WITH_AES_128_SHA - ; + TLS1_TXT_DHE_RSA_WITH_AES_128_SHA ":" +#ifdef TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 + TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 ":" +#endif +#ifdef TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 + TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 +#endif + ; /* Note: to set up your own private testing network with link crypto * disabled, set your Tors' cipher list to

1 0

[tor/master] Teach gen_server_ciphers about CCM and Chacha.
by nickm＠torproject.org 27 Jan '17

27 Jan '17

commit 8a9eca12677f906dcd7e2161c3c5b4e338b9d204 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 24 15:29:26 2017 -0500 Teach gen_server_ciphers about CCM and Chacha. Also, teach it to not use 3DES any more. --- scripts/codegen/gen_server_ciphers.py | 50 ++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/scripts/codegen/gen_server_ciphers.py b/scripts/codegen/gen_server_ciphers.py index 0dca8a6..7b61d86 100755 --- a/scripts/codegen/gen_server_ciphers.py +++ b/scripts/codegen/gen_server_ciphers.py @@ -13,7 +13,8 @@ import sys EPHEMERAL_INDICATORS = [ "_EDH_", "_DHE_", "_ECDHE_" ] BAD_STUFF = [ "_DES_40_", "MD5", "_RC4_", "_DES_64_", - "_SEED_", "_CAMELLIA_", "_NULL" ] + "_SEED_", "_CAMELLIA_", "_NULL", + "_CCM_8", "_DES_", ] # these never get #ifdeffed. MANDATORY = [ @@ -48,15 +49,23 @@ def usable_cipher(ciph): # All fields we sort on, in order of priority. FIELDS = [ 'cipher', 'fwsec', 'mode', 'digest', 'bitlength' ] # Map from sorted fields to recognized value in descending order of goodness -FIELD_VALS = { 'cipher' : [ 'AES', 'DES'], +FIELD_VALS = { 'cipher' : [ 'AES', 'CHACHA20' ], 'fwsec' : [ 'ECDHE', 'DHE' ], - 'mode' : [ 'GCM', 'CBC' ], - 'digest' : [ 'SHA384', 'SHA256', 'SHA' ], + 'mode' : [ 'POLY1305', 'GCM', 'CCM', 'CBC', ], + 'digest' : [ 'n/a', 'SHA384', 'SHA256', 'SHA', ], 'bitlength' : [ '256', '128', '192' ], } class Ciphersuite(object): def __init__(self, name, fwsec, cipher, bitlength, mode, digest): + if fwsec == 'EDH': + fwsec = 'DHE' + + if mode in [ '_CBC3', '_CBC', '' ]: + mode = 'CBC' + elif mode == '_GCM': + mode = 'GCM' + self.name = name self.fwsec = fwsec self.cipher = cipher @@ -74,27 +83,32 @@ class Ciphersuite(object): def parse_cipher(ciph): m = re.match('(?:TLS1|SSL3)_TXT_(EDH|DHE|ECDHE)_RSA(?:_WITH)?_(AES|DES)_(256|128|192)(|_CBC|_CBC3|_GCM)_(SHA|SHA256|SHA384)$', ciph) - if not m: - print "/* Couldn't parse %s ! */"%ciph - return None + if m: + fwsec, cipher, bits, mode, digest = m.groups() + return Ciphersuite(ciph, fwsec, cipher, bits, mode, digest) + + m = re.match('(?:TLS1|SSL3)_TXT_(EDH|DHE|ECDHE)_RSA(?:_WITH)?_(AES|DES)_(256|128|192)_CCM', ciph) + if m: + fwsec, cipher, bits = m.groups() + return Ciphersuite(ciph, fwsec, cipher, bits, "CCM", "n/a") - fwsec, cipher, bits, mode, digest = m.groups() - if fwsec == 'EDH': - fwsec = 'DHE' + m = re.match('(?:TLS1|SSL3)_TXT_(EDH|DHE|ECDHE)_RSA(?:_WITH)?_CHACHA20_POLY1305', ciph) + if m: + fwsec, = m.groups() + return Ciphersuite(ciph, fwsec, "CHACHA20", "256", "POLY1305", "n/a") - if mode in [ '_CBC3', '_CBC', '' ]: - mode = 'CBC' - elif mode == '_GCM': - mode = 'GCM' + print "/* Couldn't parse %s ! */"%ciph + return None - return Ciphersuite(ciph, fwsec, cipher, bits, mode, digest) ALL_CIPHERS = [] for fname in sys.argv[1:]: - ALL_CIPHERS += (parse_cipher(c) - for c in find_ciphers(fname) - if usable_cipher(c) ) + for c in find_ciphers(fname): + if usable_cipher(c): + parsed = parse_cipher(c) + if parsed != None: + ALL_CIPHERS.append(parsed) ALL_CIPHERS.sort(key=Ciphersuite.sort_key)

1 0

[tor/master] Merge branches 'server_ciphers' and 'ciphers.inc'
by nickm＠torproject.org 27 Jan '17

27 Jan '17

commit 67eb6470d711b36d1b855e6423ce7bbb302af834 Merge: 3bfe5da 26a9787 4f1dc34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 27 16:45:18 2017 -0500 Merge branches 'server_ciphers' and 'ciphers.inc' changes/ciphers.inc | 5 +++ changes/server_cipher | 3 ++ scripts/codegen/gen_server_ciphers.py | 62 ++++++++++++++++---------- scripts/codegen/get_mozilla_ciphers.py | 13 +++--- src/common/ciphers.inc | 80 +++++++++------------------------- src/common/tortls.c | 16 ++++++- 6 files changed, 89 insertions(+), 90 deletions(-)

1 0

[tor/master] MOre gen_server_ciphers improvements:
by nickm＠torproject.org 27 Jan '17

27 Jan '17

commit 26a9787aa50b50f724f3f58294f3780b83149acf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 27 16:15:26 2017 -0500 MOre gen_server_ciphers improvements: - Remove DES from mandatory list. - always put the closing ; on its own line. --- scripts/codegen/gen_server_ciphers.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/codegen/gen_server_ciphers.py b/scripts/codegen/gen_server_ciphers.py index 7b61d86..7470f8a 100755 --- a/scripts/codegen/gen_server_ciphers.py +++ b/scripts/codegen/gen_server_ciphers.py @@ -20,7 +20,6 @@ BAD_STUFF = [ "_DES_40_", "MD5", "_RC4_", "_DES_64_", MANDATORY = [ "TLS1_TXT_DHE_RSA_WITH_AES_256_SHA", "TLS1_TXT_DHE_RSA_WITH_AES_128_SHA", - "SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA", ] def find_ciphers(filename): @@ -112,18 +111,21 @@ for fname in sys.argv[1:]: ALL_CIPHERS.sort(key=Ciphersuite.sort_key) +indent = " "*7 + for c in ALL_CIPHERS: if c is ALL_CIPHERS[-1]: - colon = ';' + colon = '' else: colon = ' ":"' if c.name in MANDATORY: - print " /* Required */" - print ' %s%s'%(c.name,colon) + print "%s/* Required */"%indent + print '%s%s%s'%(indent,c.name,colon) else: print "#ifdef %s"%c.name - print ' %s%s'%(c.name,colon) + print '%s%s%s'%(indent,c.name,colon) print "#endif" +print '%s;'%indent

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 27 Jan '17

27 Jan '17

commit 0e20e1cf66d3e4b608e91435ea4d7acf18e9eb48 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 27 21:46:21 2017 +0000 Update translations for abouttor-homepage_completed --- it/aboutTor.dtd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index 95cbb57..dbbd05c 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -29,8 +29,9 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor NON è tutto ciò che ti serve per navigare anonimamente! Potresti aver bisogno di cambiare le tue abitudini di navigazione per accertarti che la tua identità rimanga al sicuro."> <!ENTITY aboutTor.whatnext.label "Consigli Per Restare Anonimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Manuale utente di Tor Browser »"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Manuale utente di Tor Browser"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/it"> <!ENTITY aboutTor.helpInfo1.label "Puoi Aiutare!"> <!ENTITY aboutTor.helpInfo2.label "Ci sono molti modi in cui puoi aiutare a rendere la Rete Tor più veloce e stabile:"> <!ENTITY aboutTor.helpInfo3.label "Gestisci un Nodo Relay di Tor »">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 27 Jan '17

27 Jan '17

commit b5eadb605fec557dc158fa14fcc0652e9effdd36 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 27 21:46:17 2017 +0000 Update translations for abouttor-homepage --- it/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index d515ae2..dbbd05c 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -30,8 +30,8 @@ <!ENTITY aboutTor.whatnext.label "Consigli Per Restare Anonimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/en-US"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Manuale utente di Tor Browser"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/it"> <!ENTITY aboutTor.helpInfo1.label "Puoi Aiutare!"> <!ENTITY aboutTor.helpInfo2.label "Ci sono molti modi in cui puoi aiutare a rendere la Rete Tor più veloce e stabile:"> <!ENTITY aboutTor.helpInfo3.label "Gestisci un Nodo Relay di Tor »">

1 0

[tor-browser-bundle/master] Bug 21332: libcxx is not needed for snowflake support on Linux
by gk＠torproject.org 27 Jan '17

27 Jan '17

commit 6e78d453a906909c5051e33f23033f13186cad82 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 27 09:59:50 2017 +0000 Bug 21332: libcxx is not needed for snowflake support on Linux --- gitian/fetch-inputs.sh | 1 - gitian/verify-tags.sh | 1 - gitian/versions | 1 - gitian/versions.alpha | 1 - gitian/versions.nightly | 1 - 5 files changed, 5 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 8c543d8..0ae2df5 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -277,7 +277,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR cmake https://cmake.org/cmake.git $CMAKE_TAG llvm https://github.com/llvm-mirror/llvm $LLVM_TAG clang https://github.com/llvm-mirror/clang $CLANG_TAG -libcxx https://github.com/llvm-mirror/libcxx $LIBCXX_TAG mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 368a990..e8dfe3f 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -111,7 +111,6 @@ while read dir commit; do done << EOF llvm $LLVM_TAG clang $CLANG_TAG -libcxx $LIBCXX_TAG mingw-w64-git $MINGW_TAG libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG diff --git a/gitian/versions b/gitian/versions index 598a945..91bea14 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,6 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -LIBCXX_TAG=af9a44f256be54de6874d1eefd1d282d0671c0cf # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a6f1aac..0644778 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,6 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -LIBCXX_TAG=af9a44f256be54de6874d1eefd1d282d0671c0cf # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d181106..ac8cfd1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -32,7 +32,6 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -LIBCXX_TAG=af9a44f256be54de6874d1eefd1d282d0671c0cf # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master

1 0

[torspec/master] prop224: Add the can't relay cell status to INTRODUCE_ACK
by dgoulet＠torproject.org 27 Jan '17

27 Jan '17

commit f69589490f2a82fa12e74860475f394c33d5d0d6 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jan 27 11:46:59 2017 -0500 prop224: Add the can't relay cell status to INTRODUCE_ACK Current implementation added that status to indicate to the client that the IP can't relay the INTRODUCE cell to the service. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 72093b3..4ef1ae3 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1528,6 +1528,7 @@ Table of contents: [00 00] -- Success: cell relayed to hidden service host. [00 01] -- Failure: service ID not recognized [00 02] -- Bad message format + [00 03] -- Can't relay cell to service 3.3. Processing an INTRODUCE2 cell at the hidden service. [PROCESS_INTRO2]

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket21269_030_01'
by nickm＠torproject.org 27 Jan '17

27 Jan '17

commit 3bfe5dae048a66da629c37e707a1d21fe46d3984 Merge: 8bd3c1b e1337b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 27 11:26:23 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket21269_030_01' changes/feature21269 | 3 +++ src/or/config.c | 3 ++- src/test/test_config.c | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] client: set IPv6Traffic to on by default
by nickm＠torproject.org 27 Jan '17

27 Jan '17

commit e1337b42525c03890e1dd3b7448eb33eae321e30 Author: Daniel Kahn Gillmor <dkg(a)fifthhorseman.net> Date: Mon Jan 23 13:22:11 2017 -0500 client: set IPv6Traffic to on by default See: https://trac.torproject.org/projects/tor/ticket/21269 https://bugs.debian.org/851798 Closes #21269 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/feature21269 | 3 +++ src/or/config.c | 3 ++- src/test/test_config.c | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/feature21269 b/changes/feature21269 new file mode 100644 index 0000000..56d5dcc --- /dev/null +++ b/changes/feature21269 @@ -0,0 +1,3 @@ + o Minor Feature (client): + - Enable IPv6 traffic by default on the SocksPort. To disable this, a user + will have to specify "NoIPv6Traffic". Closes #21269. diff --git a/src/or/config.c b/src/or/config.c index d0ca561..1ea8712 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6246,6 +6246,7 @@ port_cfg_new(size_t namelen) tor_assert(namelen <= SIZE_T_CEILING - sizeof(port_cfg_t) - 1); port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t) + namelen + 1); cfg->entry_cfg.ipv4_traffic = 1; + cfg->entry_cfg.ipv6_traffic = 1; cfg->entry_cfg.dns_request = 1; cfg->entry_cfg.onion_traffic = 1; cfg->entry_cfg.cache_ipv4_answers = 1; @@ -6599,7 +6600,7 @@ parse_port_config(smartlist_t *out, /* This must be kept in sync with port_cfg_new's defaults */ int no_listen = 0, no_advertise = 0, all_addrs = 0, bind_ipv4_only = 0, bind_ipv6_only = 0, - ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, dns_request = 1, + ipv4_traffic = 1, ipv6_traffic = 1, prefer_ipv6 = 0, dns_request = 1, onion_traffic = 1, cache_ipv4 = 1, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, diff --git a/src/test/test_config.c b/src/test/test_config.c index eeda34e..3b19cad 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4129,6 +4129,7 @@ test_config_parse_port_config__ports__ports_given(void *data) config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("SOCKSPort", "unix:/tmp/foo/bar NoIPv4Traffic " + "NoIPv6Traffic " "NoOnionTraffic"); ret = parse_port_config(NULL, config_port_invalid, NULL, "SOCKS", CONN_TYPE_AP_LISTENER, NULL, 0, @@ -4150,6 +4151,7 @@ test_config_parse_port_config__ports__ports_given(void *data) SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("DNSPort", "127.0.0.1:80 " + "NoIPv6Traffic " "NoIPv4Traffic NoOnionTraffic"); ret = parse_port_config(slout, config_port_valid, NULL, "DNS", CONN_TYPE_AP_DNS_LISTENER, NULL, 0, @@ -4165,6 +4167,7 @@ test_config_parse_port_config__ports__ports_given(void *data) // Test failure if we have DNS but no ipv4 and no ipv6 config_free_lines(config_port_invalid); config_port_invalid = NULL; config_port_invalid = mock_config_line("SOCKSPort", + "NoIPv6Traffic " "unix:/tmp/foo/bar NoIPv4Traffic"); ret = parse_port_config(NULL, config_port_invalid, NULL, "SOCKS", CONN_TYPE_AP_LISTENER, NULL, 0, @@ -4177,6 +4180,7 @@ test_config_parse_port_config__ports__ports_given(void *data) SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("SOCKSPort", "unix:/tmp/foo/bar " + "NoIPv6Traffic " "NoDNSRequest NoIPv4Traffic"); ret = parse_port_config(slout, config_port_valid, NULL, "SOCKS", CONN_TYPE_AP_LISTENER, NULL, 0, @@ -4198,6 +4202,7 @@ test_config_parse_port_config__ports__ports_given(void *data) SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("SOCKSPort", "unix:\"/tmp/foo/ bar\" " + "NoIPv6Traffic " "NoDNSRequest NoIPv4Traffic"); ret = parse_port_config(slout, config_port_valid, NULL, "SOCKS", CONN_TYPE_AP_LISTENER, NULL, 0, @@ -4219,6 +4224,7 @@ test_config_parse_port_config__ports__ports_given(void *data) SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("SOCKSPort", "unix:\"/tmp/foo/ bar " + "NoIPv6Traffic " "NoDNSRequest NoIPv4Traffic"); ret = parse_port_config(slout, config_port_valid, NULL, "SOCKS", CONN_TYPE_AP_LISTENER, NULL, 0, @@ -4230,6 +4236,7 @@ test_config_parse_port_config__ports__ports_given(void *data) SMARTLIST_FOREACH(slout,port_cfg_t *,pf,port_cfg_free(pf)); smartlist_clear(slout); config_port_valid = mock_config_line("SOCKSPort", "unix:\"\" " + "NoIPv6Traffic " "NoDNSRequest NoIPv4Traffic"); ret = parse_port_config(slout, config_port_valid, NULL, "SOCKS", CONN_TYPE_AP_LISTENER, NULL, 0, @@ -4604,7 +4611,7 @@ test_config_parse_port_config__ports__ports_given(void *data) tt_int_op(smartlist_len(slout), OP_EQ, 1); port_cfg = (port_cfg_t *)smartlist_get(slout, 0); tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1); - tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 0); + tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1); // Test failure for a SessionGroup argument with invalid value config_free_lines(config_port_invalid); config_port_invalid = NULL;

1 0