From 9a0808b1ee4cca94a3178b14838b558bf03d483b Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Tue, 7 Mar 2017 21:03:05 +0100
Subject: configfile: HKDF feature flag should also be set for
 "-plaintextnames"

---
 internal/configfile/config_file.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go
index c769b99..bf56f8b 100644
--- a/internal/configfile/config_file.go
+++ b/internal/configfile/config_file.go
@@ -58,6 +58,7 @@ func CreateConfFile(filename string, password string, plaintextNames bool, logN
 
 	// Set feature flags
 	cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagGCMIV128])
+	cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagHKDF])
 	if plaintextNames {
 		cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagPlaintextNames])
 	} else {
@@ -65,7 +66,6 @@ func CreateConfFile(filename string, password string, plaintextNames bool, logN
 		cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagEMENames])
 		cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagLongNames])
 		cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagRaw64])
-		cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagHKDF])
 	}
 	if aessiv {
 		cf.FeatureFlags = append(cf.FeatureFlags, knownFlags[FlagAESSIV])
-- 
cgit v1.2.3