From 40448db90971b42d9e5e7b7b7918f36283575759 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 4 Oct 2015 00:26:20 +0200
Subject: Fix xfstests generic/030 failure

The actual fix is

	oldSize := f.cfs.PlainSize(uint64(fi.Size()))

the rest is logging improvements
---
 cryptfs/cryptfs_content.go | 1 +
 cryptfs/log.go             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'cryptfs')

diff --git a/cryptfs/cryptfs_content.go b/cryptfs/cryptfs_content.go
index a4dc78a..a903e02 100644
--- a/cryptfs/cryptfs_content.go
+++ b/cryptfs/cryptfs_content.go
@@ -79,6 +79,7 @@ func (be *CryptFS) DecryptBlock(ciphertext []byte) ([]byte, error) {
 
 	if err != nil {
 		Warn.Printf("DecryptBlock: %s, len=%d, md5=%s\n", err.Error(), len(ciphertextOrig), Warn.Md5sum(ciphertextOrig))
+		Debug.Println(hex.Dump(ciphertextOrig))
 		return nil, err
 	}
 
diff --git a/cryptfs/log.go b/cryptfs/log.go
index 850ec9e..0884473 100644
--- a/cryptfs/log.go
+++ b/cryptfs/log.go
@@ -34,7 +34,7 @@ func (l *logChannel) Enable() {
 // CPU cycles
 func (l *logChannel) Md5sum(buf []byte) string {
 	if l.enabled == false {
-		return ""
+		return "disabled"
 	}
 	return md5sum(buf)
 }
-- 
cgit v1.2.3