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

refactor: bcrypt key derivation to aead (#491) #15589

Closed
wants to merge 0 commits into from
Closed

Conversation

bizk
Copy link
Contributor

@bizk bizk commented Mar 28, 2023

Description

Closes: #3129

  • Replaced bcrypt key derivation for argon2id, this approach is secure and resolves most of bcrypt common issues. Algorithm implementation uses these parameters
const (
	argon2Time    = 1 // Recommended by library authors: Uses max memory available
	argon2Memory  = 64 * 1024 // Memory usage 
	argon2Threads = 4
	argon2KeyLen  = 32 // Key bytes
)
  • Replaced xsalsa20 symmetric encryption with AEAD ChaCha20Poly
  • Added backward compatibility for old keys.
  • Added respective tests
  • Fixed suggestions and comments by @facundomedica

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

🔗 zboto Link

@bizk bizk requested a review from a team as a code owner March 28, 2023 22:13
@github-prbot github-prbot requested review from a team, likhita-809 and testinginprod and removed request for a team March 28, 2023 22:13
@tac0turtle
Copy link
Member

Is this backwards compatible?

Copy link
Member

@facundomedica facundomedica left a comment

Choose a reason for hiding this comment

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

Looks good, please check the errors in the tests

crypto/armor.go Outdated Show resolved Hide resolved
crypto/armor.go Outdated Show resolved Hide resolved
crypto/armor.go Outdated Show resolved Hide resolved
@bizk
Copy link
Contributor Author

bizk commented Apr 3, 2023

@tac0turtle > Is this backwards compatible?

Yes it is backward compatible, we check the header of the new method are there otherwise we do things the old way (bcrypt and salsa)

Thanks for reviewing the code @facundomedica

@IdaTucker
Copy link

tac0turtle

The change is backwards compatible: as was pointed out to us by Facundo, there is a header field called kdf, which used to be set to bcrypt, and from this change onwards, the kdf field will be set to argon2.
Upon decryption if the field is set to argon2, we use the AEAD, otherwise we fall back to the old way of generating the decryption key and decrypting.

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.

Improper use of bcrypt API
4 participants