mirrors/age
1
0
Fork 0
mirror of https://github.com/FiloSottile/age.git synced 2026-09-19 06:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

age: reject leading zeroes and sign in scrypt work factor

Browse Source
This commit is contained in:
Filippo Valsorda
2022-06-19 17:52:30 +02:00
parent 2088adf268
commit 2e090545df
42 changed files with 456 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/testkit/testkit.go
+9
View File
@@ -90,6 +90,11 @@ func (f *TestFile) ArgsLine(args ...string) {
f.TextLine(strings.Join(append([]string{"->"}, args...), " "))
}
func (f *TestFile) UnreadArgsLine() []string {
line := strings.TrimPrefix(f.UnreadLine(), "-> ")
return strings.Split(line, " ")
}
var b64 = base64.RawStdEncoding.EncodeToString
func (f *TestFile) Body(body []byte) {
@@ -160,6 +165,10 @@ func (f *TestFile) ScryptRecordPassphrase(passphrase string) {
func (f *TestFile) ScryptNoRecordPassphrase(passphrase string, workFactor int) {
salt := f.Rand(16)
f.ScryptNoRecordPassphraseWithSalt(passphrase, workFactor, salt)
}
func (f *TestFile) ScryptNoRecordPassphraseWithSalt(passphrase string, workFactor int, salt []byte) {
f.ArgsLine("scrypt", b64(salt), strconv.Itoa(workFactor))
key, err := scrypt.Key([]byte(passphrase), append([]byte("age-encryption.org/v1/scrypt"), salt...),
1<<workFactor, 8, 1, 32)