diff options
| author | Jakob Unterwurzacher | 2017-03-06 22:43:55 +0100 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2017-03-07 20:56:50 +0100 |
| commit | 2362e67a9e5c6f1c96e987e8753eca295f283875 (patch) | |
| tree | ea15d57b4894e6430b7f1040af48c9b979554f6f /cli_args.go | |
| parent | 9f17a78b4a63d7ab5b7e09c294a483c8b806aa49 (diff) | |
cli: add "-hkdf" option
This commit also enables actually passing the HKDF setting to
fusefrontend, this was missing till now.
Diffstat (limited to 'cli_args.go')
| -rw-r--r-- | cli_args.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cli_args.go b/cli_args.go index f52d265..de36a10 100644 --- a/cli_args.go +++ b/cli_args.go @@ -18,7 +18,7 @@ type argContainer struct { debug, init, zerokey, fusedebug, openssl, passwd, fg, version, plaintextnames, quiet, nosyslog, wpanic, longnames, allow_other, ro, reverse, aessiv, nonempty, raw64, - noprealloc, speed bool + noprealloc, speed, hkdf bool masterkey, mountpoint, cipherdir, cpuprofile, extpass, memprofile, ko, passfile, ctlsock, fsname string // Configuration file name override @@ -111,6 +111,7 @@ func parseCliOpts() (args argContainer) { flagSet.BoolVar(&args.raw64, "raw64", false, "Use unpadded base64 for file names") flagSet.BoolVar(&args.noprealloc, "noprealloc", false, "Disable preallocation before writing") flagSet.BoolVar(&args.speed, "speed", false, "Run crypto speed test") + flagSet.BoolVar(&args.hkdf, "hkdf", true, "Use HKDF as an additional key derivation step") flagSet.StringVar(&args.masterkey, "masterkey", "", "Mount with explicit master key") flagSet.StringVar(&args.cpuprofile, "cpuprofile", "", "Write cpu profile to specified file") flagSet.StringVar(&args.memprofile, "memprofile", "", "Write memory profile to specified file") |