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: Migrated bcrypt key derivation to argon2 and aead symmetric encryption #451

Merged
merged 12 commits into from
Mar 23, 2023

Conversation

bizk
Copy link

@bizk bizk commented Mar 16, 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.

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 changed the title Feat/bcrypt key derivation to aead Feat/Migrated to bcrypt key derivation to argon2 and aead symethric encryption Mar 16, 2023
crypto/armor.go Fixed Show fixed Hide fixed
crypto/armor.go Fixed Show fixed Hide fixed
crypto/armor.go Outdated Show resolved Hide resolved
@bizk bizk self-assigned this Mar 17, 2023
@bizk bizk changed the title Feat/Migrated to bcrypt key derivation to argon2 and aead symethric encryption Feat:Migrated to bcrypt key derivation to argon2 and aead symethric encryption Mar 20, 2023
@bizk bizk changed the title Feat:Migrated to bcrypt key derivation to argon2 and aead symethric encryption feat:Migrated to bcrypt key derivation to argon2 and aead symethric encryption Mar 20, 2023
@bizk bizk changed the title feat:Migrated to bcrypt key derivation to argon2 and aead symethric encryption refacto:Migrated to bcrypt key derivation to argon2 and aead symethric encryption Mar 20, 2023
@bizk bizk changed the title refacto:Migrated to bcrypt key derivation to argon2 and aead symethric encryption refactor:Migrated to bcrypt key derivation to argon2 and aead symethric encryption Mar 20, 2023
Copy link

@IdaTucker IdaTucker left a comment

Choose a reason for hiding this comment

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

Hmm, it seems like there are occasions where one could be trying to decrypt with a key generated the old way (with bcrypt), but with the 'new' (chachapoly) decryption algorithm, or vice versa (new key derivation algorithm but old symmetric decryption algorithm, which is in fact more of a problem since the salsa symmetric encryption algorithm is not an AEAD). I think the logic of DecryptPrivKey should be improved so that it is impossible that one attempts to decrypt using salsa decryption with a argon2id generated key.

crypto/armor.go Outdated Show resolved Hide resolved
crypto/armor.go Outdated Show resolved Hide resolved
crypto/armor.go Show resolved Hide resolved
crypto/armor.go Outdated Show resolved Hide resolved
@bizk bizk changed the title refactor:Migrated to bcrypt key derivation to argon2 and aead symethric encryption refactor:Migrated bcrypt key derivation to argon2 and aead symethric encryption Mar 21, 2023
@bizk bizk changed the title refactor:Migrated bcrypt key derivation to argon2 and aead symethric encryption refactor: Migrated bcrypt key derivation to argon2 and aead symethric encryption Mar 21, 2023
@bizk bizk requested a review from IdaTucker March 22, 2023 01:19
@bizk bizk changed the title refactor: Migrated bcrypt key derivation to argon2 and aead symethric encryption refactor: Migrated bcrypt key derivation to argon2 and aead symmetric encryption Mar 22, 2023
…x/cosmos-sdk into feat/bcrypt-key-derivation-to-aead
Copy link

@IdaTucker IdaTucker 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 to me, maybe someone with a better understanding of Go can also review this.

@bizk bizk requested review from IdaTucker, JulianToledano and raynaudoe and removed request for IdaTucker March 23, 2023 12:42
Copy link
Collaborator

@raynaudoe raynaudoe left a comment

Choose a reason for hiding this comment

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

LGTM, only a few nits

crypto/armor.go Show resolved Hide resolved
crypto/armor.go Show resolved Hide resolved
crypto/armor.go Outdated Show resolved Hide resolved
crypto/armor.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@JulianToledano JulianToledano left a comment

Choose a reason for hiding this comment

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

LGTM! 👍
only thing what Eze commented!

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