debug logging (remove me later)

diff --git a/crypto/crypto.go b/crypto/crypto.go
index 6a719ddd0c01788044b69b05e5079e41138d93ba..1f37265e0f8fe2a889df77f93df3d520f9e2a104 100644 (file)
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -39,6 +39,7 @@ import (
        "crypto/sha512"
        "encoding/hex"
        "io"
+       "log"
 
        "github.com/pkg/errors"
        "golang.org/x/crypto/argon2"
@@ -189,6 +190,7 @@ func computeKeyDescriptorV2(key *Key) (string, error) {
        if _, err := io.ReadFull(hkdf, h); err != nil {
                return "", err
        }
+        log.Printf("fcomputeKeyDescriptorV2 h=%q", hex.EncodeToString(h))
        return hex.EncodeToString(h), nil
 }
 

diff --git a/keyring/fs_keyring.go b/keyring/fs_keyring.go
index bd89ace254f8433040deddc3f93323f985f8c540..82dcaafc5bfc34e1bc2c0107a8de418a2c462d6f 100644 (file)
--- a/keyring/fs_keyring.go
+++ b/keyring/fs_keyring.go
@@ -197,6 +197,10 @@ func fsAddEncryptionKey(key *crypto.Key, descriptor string,
        arg.Raw_size = uint32(key.Len())
        C.memcpy(raw, key.UnsafePtr(), C.size_t(key.Len()))
 
+        // byteArray := *(*[]byte)(unsafe.Pointer(arg))
+        // encodedString := hex.EncodeToString(byteArray)
+        log.Printf("fsAddEncryptionKey %d %q", argKey.Len(), hex.EncodeToString(argKey.Data()))
+
        savedPrivs, err := dropPrivsIfNeeded(user, &arg.Key_spec)
        if err != nil {
                return err
@@ -204,8 +208,10 @@ func fsAddEncryptionKey(key *crypto.Key, descriptor string,
        _, _, errno := unix.Syscall(unix.SYS_IOCTL, dir.Fd(),
                unix.FS_IOC_ADD_ENCRYPTION_KEY, uintptr(argKey.UnsafePtr()))
        if errno == unix.ERANGE {
+               log.Printf("fsAddEncryptionKey64 %d %q", argKey.Len(), hex.EncodeToString(argKey.Data()))
                _, _, errno = unix.Syscall(unix.SYS_IOCTL, dir.Fd(),
                        uintptr(C.fs_ioc_add_encryption_key64), uintptr(argKey.UnsafePtr()))
+        }
        restorePrivs(savedPrivs)
 
        log.Printf("FS_IOC_ADD_ENCRYPTION_KEY(%q, %s, <raw>) = %v", mount.Path, descriptor, errno)