From adcfbd79a8b8bb85cbee25996ab622a05de0dbc1 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 6 Feb 2016 12:27:09 +0100
Subject: Rename DirIVCacheEnc to just DirIVCache
...and unexport dirIVCache
---
cryptfs/cryptfs.go | 2 +-
cryptfs/names_diriv.go | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'cryptfs')
diff --git a/cryptfs/cryptfs.go b/cryptfs/cryptfs.go
index 5b3f074..3a40e29 100644
--- a/cryptfs/cryptfs.go
+++ b/cryptfs/cryptfs.go
@@ -28,7 +28,7 @@ type CryptFS struct {
// Stores an all-zero block of size cipherBS
allZeroBlock []byte
// DirIV cache for filename encryption
- DirIVCacheEnc DirIVCache
+ DirIVCache dirIVCache
}
func NewCryptFS(key []byte, useOpenssl bool, plaintextNames bool, GCMIV128 bool) *CryptFS {
diff --git a/cryptfs/names_diriv.go b/cryptfs/names_diriv.go
index 45abfce..276316c 100644
--- a/cryptfs/names_diriv.go
+++ b/cryptfs/names_diriv.go
@@ -10,7 +10,7 @@ import (
)
// A simple one-entry DirIV cache
-type DirIVCache struct {
+type dirIVCache struct {
// Invalidated?
cleared bool
// The DirIV
@@ -24,7 +24,7 @@ type DirIVCache struct {
}
// lookup - fetch entry for "dir" from the cache
-func (c *DirIVCache) lookup(dir string) (bool, []byte, string) {
+func (c *dirIVCache) lookup(dir string) (bool, []byte, string) {
c.lock.RLock()
defer c.lock.RUnlock()
if !c.cleared && c.dir == dir {
@@ -34,7 +34,7 @@ func (c *DirIVCache) lookup(dir string) (bool, []byte, string) {
}
// store - write entry for "dir" into the caches
-func (c *DirIVCache) store(dir string, iv []byte, translatedDir string) {
+func (c *dirIVCache) store(dir string, iv []byte, translatedDir string) {
c.lock.Lock()
defer c.lock.Unlock()
c.cleared = false
@@ -43,7 +43,7 @@ func (c *DirIVCache) store(dir string, iv []byte, translatedDir string) {
c.translatedDir = translatedDir
}
-func (c *DirIVCache) Clear() {
+func (c *dirIVCache) Clear() {
c.lock.Lock()
defer c.lock.Unlock()
c.cleared = true
@@ -90,7 +90,7 @@ func (be *CryptFS) EncryptPathDirIV(plainPath string, rootDir string, eme bool)
}
// Check if the DirIV is cached
parentDir := filepath.Dir(plainPath)
- found, iv, cParentDir := be.DirIVCacheEnc.lookup(parentDir)
+ found, iv, cParentDir := be.DirIVCache.lookup(parentDir)
if found {
//fmt.Print("h")
baseName := filepath.Base(plainPath)
@@ -114,7 +114,7 @@ func (be *CryptFS) EncryptPathDirIV(plainPath string, rootDir string, eme bool)
// Cache the final DirIV
cipherPath = strings.Join(encryptedNames, "/")
cParentDir = filepath.Dir(cipherPath)
- be.DirIVCacheEnc.store(parentDir, iv, cParentDir)
+ be.DirIVCache.store(parentDir, iv, cParentDir)
return cipherPath, nil
}
--
cgit v1.2.3