From b17f0465c7c38cab2f1f4ad0fc25d64d5cd175e7 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Thu, 23 Jun 2016 21:29:00 +0200
Subject: Drop deprecated "-diriv" option

The DirIV feature flag is already mandatory, dropping the command
line option is the final step.
---
 internal/fusefrontend/names.go | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'internal/fusefrontend/names.go')

diff --git a/internal/fusefrontend/names.go b/internal/fusefrontend/names.go
index 907b6b4..54b41ae 100644
--- a/internal/fusefrontend/names.go
+++ b/internal/fusefrontend/names.go
@@ -44,9 +44,6 @@ func (fs *FS) encryptPath(plainPath string) (string, error) {
 	if fs.args.PlaintextNames {
 		return plainPath, nil
 	}
-	if !fs.args.DirIV {
-		return fs.nameTransform.EncryptPathNoIV(plainPath), nil
-	}
 	fs.dirIVLock.RLock()
 	cPath, err := fs.nameTransform.EncryptPathDirIV(plainPath, fs.args.Cipherdir)
 	tlog.Debug.Printf("encryptPath '%s' -> '%s' (err: %v)", plainPath, cPath, err)
@@ -59,9 +56,6 @@ func (fs *FS) decryptPath(cipherPath string) (string, error) {
 	if fs.args.PlaintextNames {
 		return cipherPath, nil
 	}
-	if !fs.args.DirIV {
-		return fs.nameTransform.DecryptPathNoIV(cipherPath)
-	}
 	fs.dirIVLock.RLock()
 	defer fs.dirIVLock.RUnlock()
 	return fs.nameTransform.DecryptPathDirIV(cipherPath, fs.args.Cipherdir)
-- 
cgit v1.2.3