Allow Salted S2K for high-entropy passphrases (#219)

Partially reverts #213 by allowing Salted S2K for high-entropy passphrases, as already enforced by openpgp/s2k/s2k.go:195.
ProtonMail · Jul 18, 2024 · 1da78a7 · 1da78a7
1 parent ad60d74
commit 1da78a7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/openpgp/packet/private_key.go b/openpgp/packet/private_key.go
@@ -668,7 +668,8 @@ func (pk *PrivateKey) encrypt(key []byte, params *s2k.Params, s2kType S2KType, c
 	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 {
+	if params.Mode() != s2k.Argon2S2K && params.Mode() != s2k.IteratedSaltedS2K &&
+		params.Mode() != s2k.SaltedS2K { // only allowed for high-entropy passphrases
 		return errors.InvalidArgumentError("insecure S2K mode")
 	}