summaryrefslogtreecommitdiff
path: root/mount.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2021-08-20 10:57:26 +0200
committerJakob Unterwurzacher2021-08-20 10:58:42 +0200
commit195d9d18a90d88ff2cb0530d832c59d98934fd1f (patch)
treee226de2355cfdf3f2d3a26411b85a338f2a264ef /mount.go
parent8f94083a2114c3aef4bc0320065e0374c420ea4a (diff)
Implement -deterministic-names: extended -zerodiriv
-deterministc-names uses all-zero dirivs but does not write them to disk anymore.
Diffstat (limited to 'mount.go')
-rw-r--r--mount.go35
1 files changed, 18 insertions, 17 deletions
diff --git a/mount.go b/mount.go
index 64b151b..07b589b 100644
--- a/mount.go
+++ b/mount.go
@@ -261,22 +261,22 @@ func initFuseFrontend(args *argContainer) (rootNode fs.InodeEmbedder, wipeKeys f
args.allow_other = true
}
frontendArgs := fusefrontend.Args{
- Cipherdir: args.cipherdir,
- PlaintextNames: args.plaintextnames,
- LongNames: args.longnames,
- ConfigCustom: args._configCustom,
- NoPrealloc: args.noprealloc,
- SerializeReads: args.serialize_reads,
- ForceDecode: args.forcedecode,
- ForceOwner: args._forceOwner,
- Exclude: args.exclude,
- ExcludeWildcard: args.excludeWildcard,
- ExcludeFrom: args.excludeFrom,
- Suid: args.suid,
- KernelCache: args.kernel_cache,
- SharedStorage: args.sharedstorage,
- OneFileSystem: args.one_file_system,
- ZeroDirIV: args.zerodiriv,
+ Cipherdir: args.cipherdir,
+ PlaintextNames: args.plaintextnames,
+ LongNames: args.longnames,
+ ConfigCustom: args._configCustom,
+ NoPrealloc: args.noprealloc,
+ SerializeReads: args.serialize_reads,
+ ForceDecode: args.forcedecode,
+ ForceOwner: args._forceOwner,
+ Exclude: args.exclude,
+ ExcludeWildcard: args.excludeWildcard,
+ ExcludeFrom: args.excludeFrom,
+ Suid: args.suid,
+ KernelCache: args.kernel_cache,
+ SharedStorage: args.sharedstorage,
+ OneFileSystem: args.one_file_system,
+ DeterministicNames: args.deterministic_names,
}
// confFile is nil when "-zerokey" or "-masterkey" was used
if confFile != nil {
@@ -300,7 +300,8 @@ func initFuseFrontend(args *argContainer) (rootNode fs.InodeEmbedder, wipeKeys f
// Init crypto backend
cCore := cryptocore.New(masterkey, cryptoBackend, contentenc.DefaultIVBits, args.hkdf, args.forcedecode)
cEnc := contentenc.New(cCore, contentenc.DefaultBS, args.forcedecode)
- nameTransform := nametransform.New(cCore.EMECipher, frontendArgs.LongNames, args.raw64, []string(args.badname))
+ nameTransform := nametransform.New(cCore.EMECipher, frontendArgs.LongNames,
+ args.raw64, []string(args.badname), frontendArgs.DeterministicNames)
// After the crypto backend is initialized,
// we can purge the master key from memory.
for i := range masterkey {