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.

Sign up for GitHub

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

Add json struct tags to Params #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add json struct tags to Params #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions argon2id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,28 @@ var DefaultParams = &Params{
// https://tools.ietf.org/html/draft-irtf-cfrg-argon2-04#section-4
type Params struct {
// The amount of memory used by the algorithm (in kibibytes).
Memory uint32
Memory uint32 `json:"m"`

// The number of iterations over the memory.
Iterations uint32
Iterations uint32 `json:"t"`

// The number of threads (or lanes) used by the algorithm.
// Recommended value is between 1 and runtime.NumCPU().
Parallelism uint8
Parallelism uint8 `json:"p"`

// Length of the random salt. 16 bytes is recommended for password hashing.
SaltLength uint32
SaltLength uint32 `json:"s"`

// Length of the generated key. 16 bytes or more is recommended.
KeyLength uint32
KeyLength uint32 `json:"k"`
}

// CreateHash returns an Argon2id hash of a plain-text password using the
// provided algorithm parameters. The returned hash follows the format used by
// the Argon2 reference C implementation and contains the base64-encoded Argon2id d
// derived key prefixed by the salt and parameters. It looks like this:
//
// $argon2id$v=19$m=65536,t=3,p=2$c29tZXNhbHQ$RdescudvJCsgt3ub+b+dWRWJTmaaJObG
//
// $argon2id$v=19$m=65536,t=3,p=2$c29tZXNhbHQ$RdescudvJCsgt3ub+b+dWRWJTmaaJObG
func CreateHash(password string, params *Params) (hash string, err error) {
salt, err := generateRandomBytes(params.SaltLength)
if err != nil {
Expand Down