aboutsummaryrefslogtreecommitdiff
path: root/internal/configfile/validate.go
diff options
context:
space:
mode:
authorFrank Denis2025-03-12 00:32:04 +0100
committerJakob Unterwurzacher2025-03-12 20:43:23 +0100
commit3e852eb354f99fb95b399c68d950298b33ed88ab (patch)
tree6218e3b655e5ebf778c026b9dee5b1fe3f306950 /internal/configfile/validate.go
parente9d6fb4b3f16d04fa56a66acad46eafad4f8aba1 (diff)
Do what @rfjakob asked me to do
Diffstat (limited to 'internal/configfile/validate.go')
-rw-r--r--internal/configfile/validate.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/configfile/validate.go b/internal/configfile/validate.go
index 333eea6..ad3728f 100644
--- a/internal/configfile/validate.go
+++ b/internal/configfile/validate.go
@@ -38,13 +38,16 @@ func (cf *ConfFile) Validate() error {
return fmt.Errorf("XChaCha20Poly1305 requires HKDF feature flag")
}
}
- if cf.IsFeatureFlagSet(FlagAegis) {
+ if cf.IsFeatureFlagSet(FlagAegis256X2) {
if cf.IsFeatureFlagSet(FlagGCMIV128) {
return fmt.Errorf("AEGIS conflicts with GCMIV128 feature flag")
}
+ if cf.IsFeatureFlagSet(FlagXChaCha20Poly1305) {
+ return fmt.Errorf("AEGIS conflicts with XChaCha20Poly1305 feature flag")
+ }
}
// The absence of other flags means AES-GCM (oldest algorithm)
- if !cf.IsFeatureFlagSet(FlagAegis) && !cf.IsFeatureFlagSet(FlagXChaCha20Poly1305) && !cf.IsFeatureFlagSet(FlagAESSIV) {
+ if !cf.IsFeatureFlagSet(FlagAegis256X2) && !cf.IsFeatureFlagSet(FlagXChaCha20Poly1305) && !cf.IsFeatureFlagSet(FlagAESSIV) {
if !cf.IsFeatureFlagSet(FlagGCMIV128) {
return fmt.Errorf("AES-GCM requires GCMIV128 feature flag")
}