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

Jump to bottom

Restrict S2K types #213

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Restrict S2K types #213

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions openpgp/keys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,6 +1497,9 @@ func TestEncryptAndDecryptPrivateKeys(t *testing.T) {
S2KMode: mode,
},
}
if mode == s2k.Argon2S2K {
config.AEADConfig = &packet.AEADConfig{}
}
err = entity.EncryptPrivateKeys(passphrase, config)
if err != nil {
t.Fatal(err)
Expand Down
13 changes: 13 additions & 0 deletions openpgp/packet/private_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ func (pk *PrivateKey) parse(r io.Reader) (err error) {
if pk.s2kParams.Dummy() {
return
}
if pk.s2kParams.Mode() == s2k.Argon2S2K && pk.s2kType != S2KAEAD {
return errors.StructuralError("using Argon2 S2K without AEAD is not allowed")
}
if pk.s2kParams.Mode() == s2k.SimpleS2K && pk.Version == 6 {
return errors.StructuralError("using Simple S2K with version 6 keys is not allowed")
}
pk.s2k, err = pk.s2kParams.Function()
if err != nil {
return
Expand Down Expand Up @@ -655,6 +661,13 @@ func (pk *PrivateKey) encrypt(key []byte, params *s2k.Params, s2kType S2KType, c
return errors.InvalidArgumentError("supplied encryption key has the wrong size")
}

if params.Mode() == s2k.Argon2S2K && s2kType != S2KAEAD {
return errors.InvalidArgumentError("using Argon2 S2K without AEAD is not allowed")
}
if params.Mode() != s2k.Argon2S2K && params.Mode() != s2k.IteratedSaltedS2K {
return errors.InvalidArgumentError("insecure S2K mode")
}

priv := bytes.NewBuffer(nil)
err := pk.serializePrivateKey(priv)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions openpgp/packet/private_key_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ func TestExternalPrivateKeyEncryptDecryptS2KModes(t *testing.T) {
sk2KeyTypes := []S2KType{S2KAEAD, S2KSHA1}
for _, s2kMode := range sk2Modes {
for _, sk2KeyType := range sk2KeyTypes {
if s2kMode == s2k.Argon2S2K && sk2KeyType == S2KSHA1 {
continue
}
t.Run(fmt.Sprintf("s2kMode:%d-s2kType:%d", s2kMode, sk2KeyType), func(t *testing.T) {
var configAEAD *AEADConfig
if sk2KeyType == S2KAEAD {
Expand Down
4 changes: 4 additions & 0 deletions openpgp/s2k/s2k.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,10 @@ func ParseIntoParams(r io.Reader) (params *Params, err error) {
return nil, errors.UnsupportedError("S2K function")
}

func (params *Params) Mode() Mode {
return params.mode
}

func (params *Params) Dummy() bool {
return params != nil && params.mode == GnuS2K
}
Expand Down
3 changes: 3 additions & 0 deletions openpgp/v2/keys_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,9 @@ func TestEncryptAndDecryptPrivateKeys(t *testing.T) {
S2KMode: mode,
},
}
if mode == s2k.Argon2S2K {
config.AEADConfig = &packet.AEADConfig{}
}
err = entity.EncryptPrivateKeys(passphrase, config)
if err != nil {
t.Fatal(err)
Expand Down
Loading