go-packages/argon2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Options, Encoder and Decoder properties public

Browse Source
This commit is contained in:
euphoria-laxis 2023-09-13 11:44:19 +02:00
parent 266d155418
commit b8cd7c483d
No known key found for this signature in database
GPG Key ID: B556571C219FF9D5
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
argon2/decoder.go
View File

@ -34,7 +34,7 @@ func (decoder *Decoder) decodeHash(encodedHash string) (d *Decoder, salt, hash [
if version != argon2.Version { if version != argon2.Version {
return nil, nil, nil, ErrIncompatibleVersion return nil, nil, nil, ErrIncompatibleVersion
} }
_, err = fmt.Sscanf(values[3], "m=%d,t=%d,p=%d", &decoder.memory, &decoder.iterations, &decoder.parallelism) _, err = fmt.Sscanf(values[3], "m=%d,t=%d,p=%d", &decoder.Memory, &decoder.Iterations, &decoder.Parallelism)
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
@ -43,12 +43,12 @@ func (decoder *Decoder) decodeHash(encodedHash string) (d *Decoder, salt, hash [
return nil, nil, nil, err return nil, nil, nil, err
} }
d = decoder d = decoder
d.saltLength = uint32(len(salt)) d.SaltLength = uint32(len(salt))
hash, err = base64.RawStdEncoding.DecodeString(values[5]) hash, err = base64.RawStdEncoding.DecodeString(values[5])
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }
d.keyLength = uint32(len(hash)) d.KeyLength = uint32(len(hash))
return d, salt, hash, nil return d, salt, hash, nil
} }
@ -58,7 +58,7 @@ func (decoder *Decoder) CompareStringToHash(password string, hashedPassword stri
if err != nil { if err != nil {
return false, err return false, err
} }
otherHash := argon2.IDKey([]byte(password), salt, p.iterations, p.memory, p.parallelism, p.keyLength) otherHash := argon2.IDKey([]byte(password), salt, p.Iterations, p.Memory, p.Parallelism, p.KeyLength)
if subtle.ConstantTimeCompare(hash, otherHash) == 1 { if subtle.ConstantTimeCompare(hash, otherHash) == 1 {
return true, nil return true, nil
} }

16
argon2/encoder.go
View File

@ -31,26 +31,26 @@ func (encoder *Encoder) generateRandomBytes(n uint32) ([]byte, error) {
} }
func (encoder *Encoder) HashString(password string) (encodedHash string, err error) { func (encoder *Encoder) HashString(password string) (encodedHash string, err error) {
salt, err := encoder.generateRandomBytes(encoder.saltLength) salt, err := encoder.generateRandomBytes(encoder.SaltLength)
if err != nil { if err != nil {
return "", err return "", err
} }
hash := argon2.IDKey( hash := argon2.IDKey(
[]byte(password), []byte(password),
salt, salt,
encoder.iterations, encoder.Iterations,
encoder.memory, encoder.Memory,
encoder.parallelism, encoder.Parallelism,
encoder.keyLength, encoder.KeyLength,
) )
b64Salt := base64.RawStdEncoding.EncodeToString(salt) b64Salt := base64.RawStdEncoding.EncodeToString(salt)
b64Hash := base64.RawStdEncoding.EncodeToString(hash) b64Hash := base64.RawStdEncoding.EncodeToString(hash)
encodedHash = fmt.Sprintf( encodedHash = fmt.Sprintf(
"$argon2id$v=%d$m=%d,t=%d,p=%d$%s$%s", "$argon2id$v=%d$m=%d,t=%d,p=%d$%s$%s",
argon2.Version, argon2.Version,
encoder.memory, encoder.Memory,
encoder.iterations, encoder.Iterations,
encoder.parallelism, encoder.Parallelism,
b64Salt, b64Salt,
b64Hash, b64Hash,
) )

30
argon2/options.go
View File

@ -3,22 +3,22 @@ package argon2
import "errors" import "errors"
type Options struct { type Options struct {
memory uint32 Memory uint32
iterations uint32 Iterations uint32
parallelism uint8 Parallelism uint8
saltLength uint32 SaltLength uint32
keyLength uint32 KeyLength uint32
} }
var ( var (
ErrInvalidHash = errors.New("the encoded hash is not in the correct format") ErrInvalidHash = errors.New("the encoded hash is not in the correct format")
ErrIncompatibleVersion = errors.New("incompatible version of argon2") ErrIncompatibleVersion = errors.New("incompatible version of argon2")
defaultOptions = Options{ defaultOptions = Options{
memory: 64 * 1024, Memory: 64 * 1024,
iterations: 3, Iterations: 3,
parallelism: 2, Parallelism: 2,
saltLength: 16, SaltLength: 16,
keyLength: 32, KeyLength: 32,
} }
) )
@ -26,30 +26,30 @@ type OptFunc func(*Options)
func SetMemory(memory uint32) OptFunc { func SetMemory(memory uint32) OptFunc {
return func(options *Options) { return func(options *Options) {
options.memory = memory options.Memory = memory
} }
} }
func SetIterations(iterations uint32) OptFunc { func SetIterations(iterations uint32) OptFunc {
return func(options *Options) { return func(options *Options) {
options.iterations = iterations options.Iterations = iterations
} }
} }
func SetParallelism(parallelism uint8) OptFunc { func SetParallelism(parallelism uint8) OptFunc {
return func(options *Options) { return func(options *Options) {
options.parallelism = parallelism options.Parallelism = parallelism
} }
} }
func SetSaltLength(saltLength uint32) OptFunc { func SetSaltLength(saltLength uint32) OptFunc {
return func(options *Options) { return func(options *Options) {
options.saltLength = saltLength options.SaltLength = saltLength
} }
} }
func SetKeyLength(keyLength uint32) OptFunc { func SetKeyLength(keyLength uint32) OptFunc {
return func(options *Options) { return func(options *Options) {
options.keyLength = keyLength options.KeyLength = keyLength
} }
} }