aboutsummaryrefslogtreecommitdiff
path: root/mount.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2017-03-06 22:43:55 +0100
committerJakob Unterwurzacher2017-03-07 20:56:50 +0100
commit2362e67a9e5c6f1c96e987e8753eca295f283875 (patch)
treeea15d57b4894e6430b7f1040af48c9b979554f6f /mount.go
parent9f17a78b4a63d7ab5b7e09c294a483c8b806aa49 (diff)
cli: add "-hkdf" option
This commit also enables actually passing the HKDF setting to fusefrontend, this was missing till now.
Diffstat (limited to 'mount.go')
-rw-r--r--mount.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/mount.go b/mount.go
index 8709124..f4b562d 100644
--- a/mount.go
+++ b/mount.go
@@ -190,12 +190,14 @@ func initFuseFrontend(key []byte, args *argContainer, confFile *configfile.ConfF
ConfigCustom: args._configCustom,
Raw64: args.raw64,
NoPrealloc: args.noprealloc,
+ HKDF: args.hkdf,
}
// confFile is nil when "-zerokey" or "-masterkey" was used
if confFile != nil {
// Settings from the config file override command line args
frontendArgs.PlaintextNames = confFile.IsFeatureFlagSet(configfile.FlagPlaintextNames)
frontendArgs.Raw64 = confFile.IsFeatureFlagSet(configfile.FlagRaw64)
+ frontendArgs.HKDF = confFile.IsFeatureFlagSet(configfile.FlagHKDF)
if confFile.IsFeatureFlagSet(configfile.FlagAESSIV) {
frontendArgs.CryptoBackend = cryptocore.BackendAESSIV
} else if args.reverse {