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

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 26 Feb '19

26 Feb '19

commit fc9274d509d96fd944c4dca80930a09536010f49 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 26 20:16:54 2019 +0000 Update translations for tails-openpgp-applet --- fr/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/openpgp-applet.pot b/fr/openpgp-applet.pot index 84fa7e026..4ecb9561f 100644 --- a/fr/openpgp-applet.pot +++ b/fr/openpgp-applet.pot @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2019-01-15 12:27+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-02-26 20:04+0000\n" +"Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 26 Feb '19

26 Feb '19

commit 5032e77b8ca1320001abe7b85b40bba316174e64 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 26 20:15:23 2019 +0000 Update translations for bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index 153b7c45e..9251ff6ba 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -30,7 +30,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-11-21 14:37+0000\n" +"PO-Revision-Date: 2019-02-26 20:04+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 26 Feb '19

26 Feb '19

commit 3e007d9654f5df854a1ba3fdfb253d9e43da6721 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 26 20:15:16 2019 +0000 Update translations for bridgedb --- fr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po index 153b7c45e..9251ff6ba 100644 --- a/fr/LC_MESSAGES/bridgedb.po +++ b/fr/LC_MESSAGES/bridgedb.po @@ -30,7 +30,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-11-21 14:37+0000\n" +"PO-Revision-Date: 2019-02-26 20:04+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[onionperf/master] Reintroduces oneshot argument to measurement class constructor
by irl＠torproject.org 26 Feb '19

26 Feb '19

commit da26c9133bf6cb8f68d019949a82f45aa87993f8 Author: Ana Custura <ana(a)nestat.org.uk> Date: Tue Feb 26 17:52:04 2019 +0100 Reintroduces oneshot argument to measurement class constructor --- onionperf/measurement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index 052ae73..0318ea3 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -160,7 +160,7 @@ def logrotate_thread_task(writables, tgen_writable, torctl_writable, docroot, ni class Measurement(object): - def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, nickname): + def __init__(self, tor_bin_path, tgen_bin_path, datadir_path, nickname, oneshot): self.tor_bin_path = tor_bin_path self.tgen_bin_path = tgen_bin_path self.datadir_path = datadir_path

1 0

[onionperf/master] Wraps function arguments in quotes
by irl＠torproject.org 26 Feb '19

26 Feb '19

commit 005fe9a95f49f2cdbac7ca3b47ac8ddb4b5aad39 Author: Ana Custura <ana(a)nestat.org.uk> Date: Tue Feb 26 17:49:26 2019 +0100 Wraps function arguments in quotes --- onionperf/measurement.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/onionperf/measurement.py b/onionperf/measurement.py index cd8b038..052ae73 100644 --- a/onionperf/measurement.py +++ b/onionperf/measurement.py @@ -323,9 +323,9 @@ class Measurement(object): else: tgen_model_args = { - tgen_port: "{0}".format(tgen_port), - tgen_servers: server_urls, - socksproxy: "127.0.0.1:{0}".format(socks_port) + "tgen_port": "{0}".format(tgen_port), + "tgen_servers": server_urls, + "socksproxy": "127.0.0.1:{0}".format(socks_port) } if self.oneshot: tgen_model = model.OneshotModel(**tgen_model_args)

1 0

[tor/master] Merge branch 'maint-0.3.5'
by asn＠torproject.org 26 Feb '19

26 Feb '19

commit ec695755e730ad73b60542c21971353fedce16b1 Merge: 732855c2e 1216f9953 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 10:48:14 2019 -0500 Merge branch 'maint-0.3.5'

1 0

[tor/master] Merge branch 'tor-github/pr/729'
by asn＠torproject.org 26 Feb '19

26 Feb '19

commit 39a10499326fc020a1ad05e9dd3341d7e21e8873 Merge: b402a0887 e1ad22643 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 26 20:15:40 2019 +0200 Merge branch 'tor-github/pr/729' changes/ticket29391 | 3 + scripts/maint/git-merge-forward.sh | 194 +++++++++++++++++++++++++++++++++++++ scripts/maint/git-pull-all.sh | 178 ++++++++++++++++++++++++++++++++++ scripts/maint/git-push-all.sh | 12 +++ 4 files changed, 387 insertions(+)

1 0

[tor/master] maint: Helpful scripts for tor maintenance
by asn＠torproject.org 26 Feb '19

26 Feb '19

commit e1ad22643e414da9802f4f5c2522fde35933fd47 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 14 14:27:40 2019 -0500 maint: Helpful scripts for tor maintenance Closes #29391 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket29391 | 3 + scripts/maint/git-merge-forward.sh | 194 +++++++++++++++++++++++++++++++++++++ scripts/maint/git-pull-all.sh | 178 ++++++++++++++++++++++++++++++++++ scripts/maint/git-push-all.sh | 12 +++ 4 files changed, 387 insertions(+) diff --git a/changes/ticket29391 b/changes/ticket29391 new file mode 100644 index 000000000..f00fa61c4 --- /dev/null +++ b/changes/ticket29391 @@ -0,0 +1,3 @@ + o Minor feature (maintenance scripts): + - Add to scripts/maint/ helper maintainer scripts used for git maintenance. + Closes ticket 29391. diff --git a/scripts/maint/git-merge-forward.sh b/scripts/maint/git-merge-forward.sh new file mode 100755 index 000000000..3728067e7 --- /dev/null +++ b/scripts/maint/git-merge-forward.sh @@ -0,0 +1,194 @@ +#!/bin/bash + +############################## +# Configuration (change me!) # +############################## + +# The general setup that is suggested here is: +# +# GIT_PATH = /home/<user>/git/ +# ... where the git repository directories resides. +# TOR_MASTER_NAME = "tor" +# ... which means that tor.git was cloned in /home/<user>/git/tor +# TOR_WKT_NAME = "tor-wkt" +# ... which means that the tor worktrees are in /home/<user>/git/tor-wkt + +# Where are all those git repositories? +GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY" +# The tor master git repository directory from which all the worktree have +# been created. +TOR_MASTER_NAME="tor" +# The worktrees location (directory). +TOR_WKT_NAME="tor-wkt" + +######################### +# End of configuration. # +######################### + +# Configuration of the branches that needs merging. The values are in order: +# (1) Branch name that we merge onto. +# (2) Branch name to merge from. In other words, this is merge into (1) +# (3) Full path of the git worktree. +# +# As an example: +# $ cd <PATH/TO/WORKTREE> (3) +# $ git checkout maint-0.3.5 (1) +# $ git pull +# $ git merge maint-0.3.4 (2) +# +# First set of arrays are the maint-* branch and then the release-* branch. +# New arrays need to be in the WORKTREE= array else they aren't considered. +MAINT_033=( "maint-0.3.3" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.3" ) +MAINT_034=( "maint-0.3.4" "maint-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" ) +MAINT_035=( "maint-0.3.5" "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) +MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) +MAINT_MASTER=( "master" "maint-0.4.0" "$GIT_PATH/$TOR_MASTER_NAME" ) + +RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) +RELEASE_033=( "release-0.3.3" "maint-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.3" ) +RELEASE_034=( "release-0.3.4" "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" ) +RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) +RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) + +########################## +# Git Worktree to manage # +########################## + +# List of all worktrees to work on. All defined above. Ordering is important. +# Always the maint-* branch BEFORE then the release-*. +WORKTREE=( + RELEASE_029[@] + + MAINT_033[@] + RELEASE_033[@] + + MAINT_034[@] + RELEASE_034[@] + + MAINT_035[@] + RELEASE_035[@] + + MAINT_040[@] + RELEASE_040[@] + + MAINT_MASTER[@] +) +COUNT=${#WORKTREE[@]} + +# Controlled by the -n option. The dry run option will just output the command +# that would have been executed for each worktree. +DRY_RUN=0 + +# Control characters +CNRM=$'\x1b[0;0m' # Clear color + +# Bright color +BGRN=$'\x1b[1;32m' +BBLU=$'\x1b[1;34m' +BRED=$'\x1b[1;31m' +BYEL=$'\x1b[1;33m' +IWTH=$'\x1b[3;37m' + +# Strings for the pretty print. +MARKER="${BBLU}[${BGRN}+${BBLU}]${CNRM}" +SUCCESS="${BGRN}success${CNRM}" +FAILED="${BRED}failed${CNRM}" + +#################### +# Helper functions # +#################### + +# Validate the given returned value (error code), print success or failed. The +# second argument is the error output in case of failure, it is printed out. +# On failure, this function exits. +function validate_ret +{ + if [ "$1" -eq 0 ]; then + printf "%s\\n" "$SUCCESS" + else + printf "%s\\n" "$FAILED" + printf " %s" "$2" + exit 1 + fi +} + +# Switch to the given branch name. +function switch_branch +{ + local cmd="git checkout $1" + printf " %s Switching branch to %s..." "$MARKER" "$1" + if [ $DRY_RUN -eq 0 ]; then + msg=$( eval "$cmd" 2>&1 ) + validate_ret $? "$msg" + else + printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" + fi +} + +# Pull the given branch name. +function pull_branch +{ + local cmd="git pull" + printf " %s Pulling branch %s..." "$MARKER" "$1" + if [ $DRY_RUN -eq 0 ]; then + msg=$( eval "$cmd" 2>&1 ) + validate_ret $? "$msg" + else + printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" + fi +} + +# Merge the given branch name ($2) into the current branch ($1). +function merge_branch +{ + local cmd="git merge --no-edit $1" + printf " %s Merging branch %s into %s..." "$MARKER" "$1" "$2" + if [ $DRY_RUN -eq 0 ]; then + msg=$( eval "$cmd" 2>&1 ) + validate_ret $? "$msg" + else + printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" + fi +} + +# Go into the worktree repository. +function goto_repo +{ + if [ ! -d "$1" ]; then + echo " $1: Not found. Stopping." + exit 1 + fi + cd "$1" || exit +} + +############### +# Entry point # +############### + +while getopts "n" opt; do + case "$opt" in + n) DRY_RUN=1 + echo " *** DRY DRUN MODE ***" + ;; + *) + ;; + esac +done + +# Go over all configured worktree. +for ((i=0; i<COUNT; i++)); do + current=${!WORKTREE[$i]:0:1} + previous=${!WORKTREE[$i]:1:1} + repo_path=${!WORKTREE[$i]:2:1} + + printf "%s Handling branch \\n" "$MARKER" "${BYEL}$current${CNRM}" + + # Go into the worktree to start merging. + goto_repo "$repo_path" + # Checkout the current branch + switch_branch "$current" + # Update the current branch with a pull to get the latest. + pull_branch "$current" + # Merge the previous branch. Ex: merge maint-0.2.5 into maint-0.2.9. + merge_branch "$previous" "$current" +done diff --git a/scripts/maint/git-pull-all.sh b/scripts/maint/git-pull-all.sh new file mode 100755 index 000000000..e5c5d9467 --- /dev/null +++ b/scripts/maint/git-pull-all.sh @@ -0,0 +1,178 @@ +#!/bin/bash + +################################## +# User configuration (change me) # +################################## + +# The general setup that is suggested here is: +# +# GIT_PATH = /home/<user>/git/ +# ... where the git repository directories resides. +# TOR_MASTER_NAME = "tor" +# ... which means that tor.git was cloned in /home/<user>/git/tor +# TOR_WKT_NAME = "tor-wkt" +# ... which means that the tor worktrees are in /home/<user>/git/tor-wkt + +# Where are all those git repositories? +GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY" +# The tor master git repository directory from which all the worktree have +# been created. +TOR_MASTER_NAME="tor" +# The worktrees location (directory). +TOR_WKT_NAME="tor-wkt" + +######################### +# End of configuration. # +######################### + +# Configuration of the branches that needs merging. The values are in order: +# (1) Branch name to pull (update). +# (2) Full path of the git worktree. +# +# As an example: +# $ cd <PATH/TO/WORKTREE> (3) +# $ git checkout maint-0.3.5 (1) +# $ git pull +# +# First set of arrays are the maint-* branch and then the release-* branch. +# New arrays need to be in the WORKTREE= array else they aren't considered. +MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" ) +MAINT_033=( "maint-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.3" ) +MAINT_034=( "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" ) +MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) +MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) +MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) + +RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) +RELEASE_033=( "release-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.3" ) +RELEASE_034=( "release-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" ) +RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) +RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) + +########################## +# Git Worktree to manage # +########################## + +# List of all worktrees to work on. All defined above. Ordering is important. +# Always the maint-* branch first then the release-*. +WORKTREE=( + MAINT_029[@] + RELEASE_029[@] + + MAINT_033[@] + RELEASE_033[@] + + MAINT_034[@] + RELEASE_034[@] + + MAINT_035[@] + RELEASE_035[@] + + MAINT_040[@] + RELEASE_040[@] + + MAINT_MASTER[@] +) +COUNT=${#WORKTREE[@]} + +# Controlled by the -n option. The dry run option will just output the command +# that would have been executed for each worktree. +DRY_RUN=0 + +# Control characters +CNRM=$'\x1b[0;0m' # Clear color + +# Bright color +BGRN=$'\x1b[1;32m' +BBLU=$'\x1b[1;34m' +BRED=$'\x1b[1;31m' +BYEL=$'\x1b[1;33m' +IWTH=$'\x1b[3;37m' + +# Strings for the pretty print. +MARKER="${BBLU}[${BGRN}+${BBLU}]${CNRM}" +SUCCESS="${BGRN}ok${CNRM}" +FAILED="${BRED}failed${CNRM}" + +#################### +# Helper functions # +#################### + +# Validate the given returned value (error code), print success or failed. The +# second argument is the error output in case of failure, it is printed out. +# On failure, this function exits. +function validate_ret +{ + if [ "$1" -eq 0 ]; then + printf "%s\\n" "$SUCCESS" + else + printf "%s\\n" "$FAILED" + printf " %s" "$2" + exit 1 + fi +} + +# Switch to the given branch name. +function switch_branch +{ + local cmd="git checkout $1" + printf " %s Switching branch to %s..." "$MARKER" "$1" + if [ $DRY_RUN -eq 0 ]; then + msg=$( eval "$cmd" 2>&1 ) + validate_ret $? "$msg" + else + printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" + fi +} + +# Pull the given branch name. +function pull_branch +{ + local cmd="git pull" + printf " %s Pulling branch %s..." "$MARKER" "$1" + if [ $DRY_RUN -eq 0 ]; then + msg=$( eval "$cmd" 2>&1 ) + validate_ret $? "$msg" + else + printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" + fi +} + +# Go into the worktree repository. +function goto_repo +{ + if [ ! -d "$1" ]; then + echo " $1: Not found. Stopping." + exit 1 + fi + cd "$1" || exit +} + +############### +# Entry point # +############### + +while getopts "n" opt; do + case "$opt" in + n) DRY_RUN=1 + echo " *** DRY DRUN MODE ***" + ;; + *) + ;; + esac +done + +# Go over all configured worktree. +for ((i=0; i<COUNT; i++)); do + current=${!WORKTREE[$i]:0:1} + repo_path=${!WORKTREE[$i]:1:1} + + printf "%s Handling branch %s\\n" "$MARKER" "${BYEL}$current${CNRM}" + + # Go into the worktree to start merging. + goto_repo "$repo_path" + # Checkout the current branch + switch_branch "$current" + # Update the current branch with a pull to get the latest. + pull_branch "$current" +done diff --git a/scripts/maint/git-push-all.sh b/scripts/maint/git-push-all.sh new file mode 100755 index 000000000..0f4f5302a --- /dev/null +++ b/scripts/maint/git-push-all.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# The remote upstream branch on which git.torproject.org/tor.git points to. +UPSTREAM_BRANCH="upstream" + +git push $UPSTREAM_BRANCH \ + master \ + {release,maint}-0.4.0 \ + {release,maint}-0.3.5 \ + {release,maint}-0.3.4 \ + {release,maint}-0.3.3 \ + {release,maint}-0.2.9

1 0

[tor/master] Merge branch 'tor-github/pr/655'
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit b402a0887fc6a0c6426c65491f9559ee13bed341 Merge: 2a44ee9b8 d3b122485 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Feb 26 11:30:44 2019 -0500 Merge branch 'tor-github/pr/655' changes/ticket28837 | 4 + configure.ac | 30 ++++--- src/core/crypto/hs_ntor.c | 14 +--- src/ext/include.am | 2 + src/lib/crypt_ops/crypto_digest.c | 159 +++++++++++++++++++++++++++++++++++++- src/lib/crypt_ops/crypto_digest.h | 2 + src/test/test_crypto.c | 8 +- 7 files changed, 196 insertions(+), 23 deletions(-)

1 0

[tor/master] Use crypto_xof() in hs_ntor.c.
by dgoulet＠torproject.org 26 Feb '19

26 Feb '19

commit b770adbd035c33b12db1c442286eab1461a6dbe6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 17:15:03 2018 -0500 Use crypto_xof() in hs_ntor.c. --- src/core/crypto/hs_ntor.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/core/crypto/hs_ntor.c b/src/core/crypto/hs_ntor.c index c34073690..add8a2b8f 100644 --- a/src/core/crypto/hs_ntor.c +++ b/src/core/crypto/hs_ntor.c @@ -176,7 +176,6 @@ get_introduce1_key_material(const uint8_t *secret_input, uint8_t keystream[CIPHER256_KEY_LEN + DIGEST256_LEN]; uint8_t info_blob[INFO_BLOB_LEN]; uint8_t kdf_input[KDF_INPUT_LEN]; - crypto_xof_t *xof; uint8_t *ptr; /* Let's build info */ @@ -193,10 +192,8 @@ get_introduce1_key_material(const uint8_t *secret_input, tor_assert(ptr == kdf_input + sizeof(kdf_input)); /* Now we need to run kdf_input over SHAKE-256 */ - xof = crypto_xof_new(); - crypto_xof_add_bytes(xof, kdf_input, sizeof(kdf_input)); - crypto_xof_squeeze_bytes(xof, keystream, sizeof(keystream)) ; - crypto_xof_free(xof); + crypto_xof(keystream, sizeof(keystream), + kdf_input, sizeof(kdf_input)); { /* Get the keys */ memcpy(&hs_ntor_intro_cell_keys_out->enc_key, keystream,CIPHER256_KEY_LEN); @@ -594,7 +591,6 @@ hs_ntor_circuit_key_expansion(const uint8_t *ntor_key_seed, size_t seed_len, { uint8_t *ptr; uint8_t kdf_input[NTOR_KEY_EXPANSION_KDF_INPUT_LEN]; - crypto_xof_t *xof; /* Sanity checks on lengths to make sure we are good */ if (BUG(seed_len != DIGEST256_LEN)) { @@ -611,10 +607,8 @@ hs_ntor_circuit_key_expansion(const uint8_t *ntor_key_seed, size_t seed_len, tor_assert(ptr == kdf_input + sizeof(kdf_input)); /* Generate the keys */ - xof = crypto_xof_new(); - crypto_xof_add_bytes(xof, kdf_input, sizeof(kdf_input)); - crypto_xof_squeeze_bytes(xof, keys_out, HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN); - crypto_xof_free(xof); + crypto_xof(keys_out, HS_NTOR_KEY_EXPANSION_KDF_OUT_LEN, + kdf_input, sizeof(kdf_input)); return 0; }

1 0