Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Argon2 fourth part: borg benchmark cpu: use ARGON2_ARGS #6552

Merged
merged 2 commits into from
Apr 9, 2022

Conversation

hexagonrecursion
Copy link
Contributor

I have updated the cpu benchmark to use the same argon2 configuration as we use normally.

After this is merged I'll work on the last PR of #747 - the changelog and documentation updates

@codecov-commenter
Copy link

codecov-commenter commented Apr 9, 2022

Codecov Report

Merging #6552 (18963bf) into master (d386b03) will increase coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #6552      +/-   ##
==========================================
+ Coverage   83.07%   83.10%   +0.02%     
==========================================
  Files          39       39              
  Lines       10586    10586              
  Branches     2070     2070              
==========================================
+ Hits         8794     8797       +3     
+ Misses       1291     1289       -2     
+ Partials      501      500       -1     
Impacted Files Coverage Δ
src/borg/archiver.py 78.41% <ø> (ø)
src/borg/helpers/parseformat.py 90.21% <0.00%> (+0.16%) ⬆️
src/borg/locking.py 87.32% <0.00%> (+0.68%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d386b03...18963bf. Read the comment docs.

Copy link
Member

@ThomasWaldmann ThomasWaldmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

can you check that, guess it does not apply any more?

# IMPORTANT keep imports from borg here to a minimum because our testsuite depends on

@hexagonrecursion
Copy link
Contributor Author

can you check that, guess it does not apply any more?

I think you are right

fgrep -r --exclude-dir=.tox --exclude-dir=.git --exclude-dir=__pycache__ PBKDF2_ITERATIONS
src/borg/archiver.py:            ("pbkdf2", lambda: Passphrase('mypassphrase').kdf(b'salt'*8, PBKDF2_ITERATIONS, 32)),
src/borg/crypto/key.py:        iterations = PBKDF2_ITERATIONS
src/borg/__init__.py:# being able to import borg.constants and then monkey patching borg.constants.PBKDF2_ITERATIONS
src/borg/constants.py:PBKDF2_ITERATIONS = 100000

@ThomasWaldmann
Copy link
Member

BTW, if you like, we could change the plan a bit:

  • remove docs and changelog from THIS bounty, but add move kdf code #6449
  • do docs and changelog for kdf-related changes within a "update docs" bounty

What do you think?

@ThomasWaldmann ThomasWaldmann merged commit 7d33ad3 into borgbackup:master Apr 9, 2022
@hexagonrecursion
Copy link
Contributor Author

BTW, if you like, we could change the plan a bit:

* remove docs and changelog from THIS bounty, but add [move kdf code #6449](https://github.com/borgbackup/borg/issues/6449)

* do docs and changelog for kdf-related changes within a "update docs" bounty

What do you think?

Sure

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants