Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions algorithm/scrypt/hasher.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ func (h *Hasher) Validate() (err error) {
}

func (h *Hasher) validate() (err error) {
// The yescrypt variant does not support parallelism and does not encode it, so any other value would fail during
// hashing.
if h.variant == VariantYescrypt && h.p > ParallelismMin {
return fmt.Errorf("%w: parameter 'p' must be 1 for the yescrypt variant but is set to '%d'", algorithm.ErrParameterInvalid, h.p)
}

rp := uint64(h.r) * uint64(h.p)

if rp >= 1<<30 {
Expand Down
2 changes: 1 addition & 1 deletion algorithm/scrypt/opts.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func WithBlockSize(r int) Opt {
}

// WithP sets the p parameter (parallelism factor) of the resulting scrypt.Digest.
// Minimum is 1, Maximum is 1073741823. Default is 1.
// Minimum is 1, Maximum is 1073741823. Default is 1. The yescrypt variant only supports a value of 1.
func WithP(p int) Opt {
return func(h *Hasher) (err error) {
if p < ParallelismMin || p > ParallelismMax {
Expand Down
49 changes: 49 additions & 0 deletions algorithm/scrypt/regression_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/go-crypt/crypt/algorithm"
)

func TestDecodeRejectsParametersThatCannotBeUsed(t *testing.T) {
Expand Down Expand Up @@ -90,3 +92,50 @@ func TestHashedDigestsRoundTrip(t *testing.T) {
})
}
}

func TestNewYescryptRejectsParallelismOtherThanOne(t *testing.T) {
testCases := []struct {
name string
opts []Opt
}{
{"NewYescrypt", []Opt{WithP(2)}},
{"VariantAfterParallelism", []Opt{WithP(2), WithVariant(VariantYescrypt)}},
{"VariantName", []Opt{WithVariantName("yescrypt"), WithP(4)}},
}

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
hasher, err := NewYescrypt(tc.opts...)

assert.Nil(t, hasher)
assert.ErrorIs(t, err, algorithm.ErrParameterInvalid)
assert.ErrorContains(t, err, "scrypt validation error: parameter is invalid: parameter 'p' must be 1 for the yescrypt variant but is set to '")
})
}
}

func TestNewScryptAllowsParallelismOtherThanOne(t *testing.T) {
hasher, err := NewScrypt(WithLN(4), WithR(1), WithP(2))
require.NoError(t, err)

digest, err := hasher.Hash("password")
require.NoError(t, err)

decoded, err := Decode(digest.Encode())
require.NoError(t, err)

assert.True(t, decoded.Match("password"))
}

func TestNewYescryptAllowsParallelismOfOne(t *testing.T) {
hasher, err := NewYescrypt(WithLN(4), WithP(1))
require.NoError(t, err)

digest, err := hasher.Hash("password")
require.NoError(t, err)

decoded, err := Decode(digest.Encode())
require.NoError(t, err)

assert.True(t, decoded.Match("password"))
}
Loading