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

[tor/maint-0.2.8] Fold new entries into ChangeLog for 0.2.7.4-rc
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit cc3ce6854872fb9b06fbb5bb188c1c58585af282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:09:16 2015 -0400 Fold new entries into ChangeLog for 0.2.7.4-rc --- ChangeLog | 10 ++++++++++ changes/bug15609 | 2 -- changes/bug17151 | 7 ------- changes/bug17154 | 3 --- changes/bug17173-socket-hack-rv | 3 --- changes/bug17237_027 | 3 --- changes/bug17251 | 3 --- changes/bug17347 | 4 ---- changes/bug17354 | 4 ---- changes/bug17398 | 3 --- changes/bug17401 | 3 --- changes/bug17402 | 3 --- changes/geoip-october2015 | 3 --- changes/ifaddrs-tests-network-configs | 5 ----- 14 files changed, 10 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6c2d4..5041e76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,16 @@ Changes in version 0.2.7.4-rc - 2015-10-21 on different platforms. If no further significant bounds are found, the next release will the the official stable release. + o Major bugfixes (memory leaks): + - Fix a memory leak in ed25519 batch signature checking. + Fixes bug 17398; bugfix on 0.2.6.1-alpha. + - Fix a memory leak in rend_cache_failure_entry_free(). + Fixes bug 17402; bugfix on 0.2.7.3-rc. + + o Major bugfixes (correctness): + - Fix a use-after-free bug in validate_intro_point_failure(). + Fixes bug 17401; bugfix on 0.2.7.3-rc. + o Minor features (geoIP): - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database. diff --git a/changes/bug15609 b/changes/bug15609 deleted file mode 100644 index efaccde..0000000 --- a/changes/bug15609 +++ /dev/null @@ -1,2 +0,0 @@ - o Documentation: - - Fix capitalization of SOCKS in sample torrc. Closes ticket 15609. diff --git a/changes/bug17151 b/changes/bug17151 deleted file mode 100644 index 0993b90..0000000 --- a/changes/bug17151 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (portability): - - Use libexecinfo on FreeBSD, to enable backtrace support. Fixes part of - bug 17151; bugfix on 0.2.5.2-alpha. Patch from Marcin Cieślak. - - o Minor bugfixes (testing): - - Skip backtrace tests when backtrace support is not compiled in. Fixes - part of bug 17151; bugfix on 0.2.7.1-alpha. Patch from Marcin Cieślak. diff --git a/changes/bug17154 b/changes/bug17154 deleted file mode 100644 index 6ad7b74..0000000 --- a/changes/bug17154 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (testing): - - Fix breakage when running 'make check' with BSD make. Fixes bug - 17154; bugfix on 0.2.7.3-rc. Patch by Marcin Cieślak. diff --git a/changes/bug17173-socket-hack-rv b/changes/bug17173-socket-hack-rv deleted file mode 100644 index d513211..0000000 --- a/changes/bug17173-socket-hack-rv +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bug fixes (addresses, testing): - - Add unit tests for get_interface_address* failure cases. - Fixes bug 17173; bugfix on 0.2.7.3-rc. Patch by fk/teor. diff --git a/changes/bug17237_027 b/changes/bug17237_027 deleted file mode 100644 index e5978d0..0000000 --- a/changes/bug17237_027 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (compilation): - - Repair compilation with the most recent (unreleased, alpha) - vesions of OpenSSL 1.1. Fixes part of ticket 17237. diff --git a/changes/bug17251 b/changes/bug17251 deleted file mode 100644 index edd7739..0000000 --- a/changes/bug17251 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Fix an integer overflow warning in test_crypto_slow.c. - Fixes bug 17251; bugfix on 0.2.7.2-alpha. diff --git a/changes/bug17347 b/changes/bug17347 deleted file mode 100644 index 487b132..0000000 --- a/changes/bug17347 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (compilation): - - Fix compilation of sandbox.c with musl-libc. - Fixes bug 17347; bugfix on 0.2.5.1-alpha. - Patch from 'jamestk'. diff --git a/changes/bug17354 b/changes/bug17354 deleted file mode 100644 index 53da007..0000000 --- a/changes/bug17354 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (sandbox): - - Add the "hidserv-stats" filename to our sandbox filter for the - HiddenServiceStatistics option to work properly. Fixes bug 17354; - bugfix on tor-0.2.6.2-alpha~54^2~1. Patch from David Goulet. diff --git a/changes/bug17398 b/changes/bug17398 deleted file mode 100644 index 66e27a6..0000000 --- a/changes/bug17398 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (memory leaks): - - Fix a memory leak in ed25519 batch signature checking. - Fixes bug 17398; bugfix on 0.2.6.1-alpha. diff --git a/changes/bug17401 b/changes/bug17401 deleted file mode 100644 index a22f79c..0000000 --- a/changes/bug17401 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes (correctness): - - Fix a use-after-free bug in validate_intro_point_failure(). - Fixes bug 17401; bugfix on 0.2.7.3-rc. diff --git a/changes/bug17402 b/changes/bug17402 deleted file mode 100644 index 4760e00..0000000 --- a/changes/bug17402 +++ /dev/null @@ -1,3 +0,0 @@ - o Major bugfixes (memory leak): - - Fix a memory leak in rend_cache_failure_entry_free(). - Fixes bug 17402; bugfix on 0.2.7.3-rc. diff --git a/changes/geoip-october2015 b/changes/geoip-october2015 deleted file mode 100644 index f20febe..0000000 --- a/changes/geoip-october2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/ifaddrs-tests-network-configs b/changes/ifaddrs-tests-network-configs deleted file mode 100644 index 6b5ed4d..0000000 --- a/changes/ifaddrs-tests-network-configs +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (testing): - - Make the get_ifaddrs_* unit tests more tolerant of different network - configurations. (Don't assume every test box has an IPv4 address, and - Don't assume every test box has a non-localhost address. - Fixes bug 17255; bugfix on 0.2.7.3-rc. Patch by "teor".

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit ff174995f07747628ad1e71fd344fc27e88a70ed Merge: fbaee1b 5d45a26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:06:47 2015 -0400 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug17398 | 3 +++ changes/bug17401 | 3 +++ changes/bug17402 | 3 +++ src/common/crypto_ed25519.c | 1 + src/or/rendcache.c | 24 ++++++++++++++++-------- 5 files changed, 26 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.6] bump to 0.2.6.11
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 57e778f882537b5c07465e87f763bcd032cc7ea1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 28 10:26:24 2017 -0500 bump to 0.2.6.11 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 3654024..a79ea82 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.6.10-dev]) +AC_INIT([tor],[0.2.6.11]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4143cf4..6611bb8 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.6.10-dev" +!define VERSION "0.2.6.11" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 82e7e65..59cd43e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.6.10-dev" +#define VERSION "0.2.6.11"

1 0

[tor/maint-0.2.8] Reflow changelog
by nickm＠torproject.org 28 Feb '17

28 Feb '17

commit 3f3a753e36a3d6114fcaa7059a534317f5a59fc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 21 11:09:41 2015 -0400 Reflow changelog --- ChangeLog | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5041e76..259e4e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,15 +4,15 @@ Changes in version 0.2.7.4-rc - 2015-10-21 on different platforms. If no further significant bounds are found, the next release will the the official stable release. - o Major bugfixes (memory leaks): - - Fix a memory leak in ed25519 batch signature checking. - Fixes bug 17398; bugfix on 0.2.6.1-alpha. - - Fix a memory leak in rend_cache_failure_entry_free(). - Fixes bug 17402; bugfix on 0.2.7.3-rc. - o Major bugfixes (correctness): - - Fix a use-after-free bug in validate_intro_point_failure(). - Fixes bug 17401; bugfix on 0.2.7.3-rc. + - Fix a use-after-free bug in validate_intro_point_failure(). Fixes + bug 17401; bugfix on 0.2.7.3-rc. + + o Major bugfixes (memory leaks): + - Fix a memory leak in ed25519 batch signature checking. Fixes bug + 17398; bugfix on 0.2.6.1-alpha. + - Fix a memory leak in rend_cache_failure_entry_free(). Fixes bug + 17402; bugfix on 0.2.7.3-rc. o Minor features (geoIP): - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2

1 0

[onionoo/master] Bump version to 4.0-1.2.0-dev.
by karsten＠torproject.org 28 Feb '17

28 Feb '17

commit 445f3030c9c7455cdb1583e3e0254334f05ca6b8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 28 16:35:46 2017 +0100 Bump version to 4.0-1.2.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 054a78a..4fe7073 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.2.0"/> + value="${onionoo.protocol.version}-1.2.0-dev"/> <property name="descriptorversion" value="1.6.0"/> <property name="jetty.version" value="-8.1.16.v20140903" /> <property name="warfile"

1 0

[onionoo/master] Update to metrics-lib 1.6.0.
by karsten＠torproject.org 28 Feb '17

28 Feb '17

commit e185448deb89d14edb856b5329c7f2593e54e7af Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Feb 28 08:27:44 2017 +0000 Update to metrics-lib 1.6.0. --- build.xml | 2 +- .../torproject/onionoo/updater/DummyConsensus.java | 33 ++++++++++++++++++++++ .../onionoo/updater/DummyStatusEntry.java | 5 ++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 838df53..f419fa6 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="onionoo.protocol.version" value="3.2"/> <property name="release.version" value="${onionoo.protocol.version}-1.1.0-dev"/> - <property name="descriptorversion" value="1.5.0"/> + <property name="descriptorversion" value="1.6.0"/> <property name="jetty.version" value="-8.1.16.v20140903" /> <property name="warfile" value="onionoo-${release.version}.war"/> diff --git a/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java b/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java index 9745aa4..6af0b94 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyConsensus.java @@ -130,5 +130,38 @@ public class DummyConsensus implements RelayNetworkStatusConsensus { public List<DirectorySignature> getSignatures() { return null; } + + public int getSharedRandPreviousNumReveals() { + return -1; + } + + public String getSharedRandPreviousValue() { + return null; + } + + public int getSharedRandCurrentNumReveals() { + return -1; + } + + public String getSharedRandCurrentValue() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRecommendedClientProtocols() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRecommendedRelayProtocols() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRequiredClientProtocols() { + return null; + } + + public SortedMap<String, SortedSet<Long>> getRequiredRelayProtocols() { + return null; + } + } diff --git a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java index 9da51fc..7f97581 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyStatusEntry.java @@ -7,6 +7,7 @@ import org.torproject.descriptor.NetworkStatusEntry; import java.util.List; import java.util.Set; +import java.util.SortedMap; import java.util.SortedSet; import java.util.TreeSet; @@ -97,5 +98,9 @@ public class DummyStatusEntry implements NetworkStatusEntry { public String getMasterKeyEd25519() { return null; } + + public SortedMap<String, SortedSet<Long>> getProtocols() { + return null; + } }

1 0

[onionoo/master] Prepare for 4.0-1.2.0 release.
by karsten＠torproject.org 28 Feb '17

28 Feb '17

commit 4717532ab9e6f397661b203d6cedbc6112098e9c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 28 13:48:42 2017 +0100 Prepare for 4.0-1.2.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 465e145..9a170dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.0-x.x.x - 2017-xx-xx +# Changes in version 4.0-1.2.0 - 2017-02-28 * Medium changes - Accept searches by IPv6 addresses even without leading or diff --git a/build.xml b/build.xml index f419fa6..054a78a 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="3.2"/> + <property name="onionoo.protocol.version" value="4.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.1.0-dev"/> + value="${onionoo.protocol.version}-1.2.0"/> <property name="descriptorversion" value="1.6.0"/> <property name="jetty.version" value="-8.1.16.v20140903" /> <property name="warfile"

1 0

[torspec/master] prop224: Precisely specify the RENDEZVOUS1 verification procedure.
by asn＠torproject.org 28 Feb '17

28 Feb '17

commit 526ed4ad03cd66319b659b547e5651ff91870f5d Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 27 20:25:41 2017 +0200 prop224: Precisely specify the RENDEZVOUS1 verification procedure. --- proposals/224-rend-spec-ng.txt | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 4d773d4..103542a 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1808,18 +1808,31 @@ Table of contents: HANDSHAKE_INFO [variable; depends on handshake type used.] - where RENDEZVOUS_COOKIE is the cookie suggested by the client - during the introduction (see [PROCESS_INTRO2]). + where RENDEZVOUS_COOKIE is the cookie suggested by the client during the + introduction (see [PROCESS_INTRO2]) and HANDSHAKE_INFO is defined in + [NTOR-WITH-EXTRA-DATA]. If the cookie matches the rendezvous cookie set on any not-yet-connected circuit on the rendezvous point, the rendezvous point connects the two circuits, and sends a RENDEZVOUS2 cell to the client containing the contents of the RENDEZVOUS1 cell. - Upon receiving the RENDEZVOUS2 cell, the client verifies that the - HANDSHAKE_INFO correctly completes a handshake. Now both parties use the - handshake output to derive shared keys for use on the circuit as specified - in the section below: + Upon receiving the RENDEZVOUS2 cell, the client verifies that HANDSHAKE_INFO + correctly completes a handshake. To do so, the client parses SERVER_PK from + HANDSHAKE_INFO and reverses the final operations of section + [NTOR-WITH-EXTRA-DATA] as shown here: + + ntor_secret_input = EXP(Y,x) | EXP(B,x) | AUTH_KEY | B | X | Y | PROTOID + NTOR_KEY_SEED = MAC(ntor_secret_input, t_hsenc) + verify = MAC(ntor_secret_input, t_hsverify) + auth_input = verify | AUTH_KEY | B | Y | X | PROTOID | "Server" + AUTH_INPUT_MAC = MAC(auth_input, t_hsmac) + + Finally the client verifies that the received AUTH field of HANDSHAKE_INFO + is equal to the computed AUTH_INPUT_MAC. + + Now both parties use the handshake output to derive shared keys for use on + the circuit as specified in the section below: 4.2.1. Key expansion

1 0

[torspec/master] prop224: Improvements to HS ntor section.
by asn＠torproject.org 28 Feb '17

28 Feb '17

commit 08af5ef5e4000a1ea8fe09901f6040034e1205ed Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 27 20:24:03 2017 +0200 prop224: Improvements to HS ntor section. - AUTH_KEYID is actually AUTH_KEY these days - Make it more clear that the result of the ntor handshake includes a MAC. --- proposals/224-rend-spec-ng.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 50bbdd3..4d773d4 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1642,7 +1642,7 @@ Table of contents: generates a single-use keypair: x,X = KEYGEN() and computes: - secret_hs_input = EXP(B,x) | AUTH_KEYID | X | B | PROTOID + secret_hs_input = EXP(B,x) | AUTH_KEY | X | B | PROTOID info = m_hsexpand | subcredential hs_keys = KDF(secret_hs_input | t_hsenc | info, S_KEY_LEN+MAC_LEN) ENC_KEY = hs_keys[0:S_KEY_LEN] @@ -1698,7 +1698,7 @@ Table of contents: service host generates a keypair of y,Y = KEYGEN(), and uses its introduction point encryption key 'b' to computes: - secret_hs_input = EXP(X,b) | AUTH_KEYID | X | B | PROTOID + secret_hs_input = EXP(X,b) | AUTH_KEY | X | B | PROTOID info = m_hsexpand | subcredential hs_keys = KDF(secret_hs_input | t_hsenc | info, S_KEY_LEN+MAC_LEN) HS_DEC_KEY = hs_keys[0:S_KEY_LEN] @@ -1707,16 +1707,17 @@ Table of contents: (The above are used to check the MAC and then decrypt the encrypted data.) - ntor_secret_input = EXP(X,y) | EXP(X,b) | AUTH_KEYID | B | X | Y | PROTOID + ntor_secret_input = EXP(X,y) | EXP(X,b) | AUTH_KEY | B | X | Y | PROTOID NTOR_KEY_SEED = MAC(ntor_secret_input, t_hsenc) verify = MAC(ntor_secret_input, t_hsverify) - auth_input = verify | AUTH_KEYID | B | Y | X | PROTOID | "Server" + auth_input = verify | AUTH_KEY | B | Y | X | PROTOID | "Server" + AUTH_INPUT_MAC = MAC(auth_input, t_hsmac) (The above are used to finish the ntor handshake.) The server's handshake reply is: SERVER_PK Y [G_LEN bytes] - AUTH MAC(auth_input, t_hsmac) [H_LEN bytes] + AUTH AUTH_INPUT_MAC [H_LEN bytes] These fields will be sent to the client in a RENDEZVOUS1 cell using the HANDSHAKE_INFO element (see [JOIN_REND]).

1 0

[torspec/master] prop224: Rename some ntor variables for better readability.
by asn＠torproject.org 28 Feb '17

28 Feb '17

commit ade4ddaa88ac65741165061e4498f5b3136a880e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 28 13:22:10 2017 +0200 prop224: Rename some ntor variables for better readability. --- proposals/224-rend-spec-ng.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 103542a..dc33bb8 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1642,9 +1642,9 @@ Table of contents: generates a single-use keypair: x,X = KEYGEN() and computes: - secret_hs_input = EXP(B,x) | AUTH_KEY | X | B | PROTOID + intro_secret_hs_input = EXP(B,x) | AUTH_KEY | X | B | PROTOID info = m_hsexpand | subcredential - hs_keys = KDF(secret_hs_input | t_hsenc | info, S_KEY_LEN+MAC_LEN) + hs_keys = KDF(intro_secret_hs_input | t_hsenc | info, S_KEY_LEN+MAC_LEN) ENC_KEY = hs_keys[0:S_KEY_LEN] MAC_KEY = hs_keys[S_KEY_LEN:S_KEY_LEN+MAC_KEY_LEN] @@ -1688,7 +1688,7 @@ Table of contents: To process this format, the hidden service checks PK_VALID(CLIENT_PK) as necessary, and then computes ENC_KEY and MAC_KEY as the client did above, except using EXP(CLIENT_PK,b) in the calculation of - secret_hs_input. The service host then checks whether the MAC is + intro_secret_hs_input. The service host then checks whether the MAC is correct. If it is invalid, it drops the cell. Otherwise, it computes the plaintext by decrypting ENCRYPTED_DATA. @@ -1698,18 +1698,18 @@ Table of contents: service host generates a keypair of y,Y = KEYGEN(), and uses its introduction point encryption key 'b' to computes: - secret_hs_input = EXP(X,b) | AUTH_KEY | X | B | PROTOID + intro_secret_hs_input = EXP(X,b) | AUTH_KEY | X | B | PROTOID info = m_hsexpand | subcredential - hs_keys = KDF(secret_hs_input | t_hsenc | info, S_KEY_LEN+MAC_LEN) + hs_keys = KDF(intro_secret_hs_input | t_hsenc | info, S_KEY_LEN+MAC_LEN) HS_DEC_KEY = hs_keys[0:S_KEY_LEN] HS_MAC_KEY = hs_keys[S_KEY_LEN:S_KEY_LEN+MAC_KEY_LEN] (The above are used to check the MAC and then decrypt the encrypted data.) - ntor_secret_input = EXP(X,y) | EXP(X,b) | AUTH_KEY | B | X | Y | PROTOID - NTOR_KEY_SEED = MAC(ntor_secret_input, t_hsenc) - verify = MAC(ntor_secret_input, t_hsverify) + rend_secret_hs_input = EXP(X,y) | EXP(X,b) | AUTH_KEY | B | X | Y | PROTOID + NTOR_KEY_SEED = MAC(rend_secret_hs_input, t_hsenc) + verify = MAC(rend_secret_hs_input, t_hsverify) auth_input = verify | AUTH_KEY | B | Y | X | PROTOID | "Server" AUTH_INPUT_MAC = MAC(auth_input, t_hsmac) @@ -1822,7 +1822,7 @@ Table of contents: HANDSHAKE_INFO and reverses the final operations of section [NTOR-WITH-EXTRA-DATA] as shown here: - ntor_secret_input = EXP(Y,x) | EXP(B,x) | AUTH_KEY | B | X | Y | PROTOID + rend_secret_hs_input = EXP(Y,x) | EXP(B,x) | AUTH_KEY | B | X | Y | PROTOID NTOR_KEY_SEED = MAC(ntor_secret_input, t_hsenc) verify = MAC(ntor_secret_input, t_hsverify) auth_input = verify | AUTH_KEY | B | Y | X | PROTOID | "Server"

1 0