From 3e852eb354f99fb95b399c68d950298b33ed88ab Mon Sep 17 00:00:00 2001
From: Frank Denis
Date: Wed, 12 Mar 2025 00:32:04 +0100
Subject: Do what @rfjakob asked me to do

---
 internal/configfile/validate.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'internal/configfile/validate.go')

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")
 			}
-- 
cgit v1.2.3