From 8f5df19b353e02ffba842fd1b15ccf93da7ee3b4 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 7 Jul 2025 19:54:48 +0200
Subject: Fix a bunch of staticcheck errors

Tool-assisted.
---
 internal/configfile/config_file.go             |  5 ++---
 internal/configfile/scrypt.go                  | 10 +++++-----
 internal/configfile/validate.go                |  6 +++---
 internal/contentenc/content.go                 |  2 +-
 internal/fusefrontend/prepare_syscall_test.go  | 13 +++++++------
 internal/fusefrontend_reverse/excluder.go      |  3 +--
 internal/fusefrontend_reverse/excluder_test.go |  5 ++---
 internal/nametransform/diriv.go                |  2 +-
 internal/nametransform/pad16.go                | 12 ++++++------
 internal/speed/cpuinfo.go                      |  4 ++--
 internal/syscallcompat/asuser_linux.go         |  4 ++--
 internal/syscallcompat/getdents_test.go        |  5 ++---
 internal/syscallcompat/main_test.go            |  3 +--
 13 files changed, 35 insertions(+), 39 deletions(-)

(limited to 'internal')

diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go
index 995a0c8..28a1ca5 100644
--- a/internal/configfile/config_file.go
+++ b/internal/configfile/config_file.go
@@ -5,7 +5,6 @@ package configfile
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"syscall"
 
 	"os"
@@ -183,12 +182,12 @@ func Load(filename string) (*ConfFile, error) {
 	cf.filename = filename
 
 	// Read from disk
-	js, err := ioutil.ReadFile(filename)
+	js, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err
 	}
 	if len(js) == 0 {
-		return nil, fmt.Errorf("Config file is empty")
+		return nil, fmt.Errorf("config file is empty")
 	}
 
 	// Unmarshal
diff --git a/internal/configfile/scrypt.go b/internal/configfile/scrypt.go
index 0ce8777..f6201ba 100644
--- a/internal/configfile/scrypt.go
+++ b/internal/configfile/scrypt.go
@@ -87,19 +87,19 @@ func (s *ScryptKDF) LogN() int {
 func (s *ScryptKDF) validateParams() error {
 	minN := 1 << scryptMinLogN
 	if s.N < minN {
-		return fmt.Errorf("Fatal: scryptn below 10 is too low to make sense")
+		return fmt.Errorf("fatal: scryptn below 10 is too low to make sense")
 	}
 	if s.R < scryptMinR {
-		return fmt.Errorf("Fatal: scrypt parameter R below minimum: value=%d, min=%d", s.R, scryptMinR)
+		return fmt.Errorf("fatal: scrypt parameter R below minimum: value=%d, min=%d", s.R, scryptMinR)
 	}
 	if s.P < scryptMinP {
-		return fmt.Errorf("Fatal: scrypt parameter P below minimum: value=%d, min=%d", s.P, scryptMinP)
+		return fmt.Errorf("fatal: scrypt parameter P below minimum: value=%d, min=%d", s.P, scryptMinP)
 	}
 	if len(s.Salt) < scryptMinSaltLen {
-		return fmt.Errorf("Fatal: scrypt salt length below minimum: value=%d, min=%d", len(s.Salt), scryptMinSaltLen)
+		return fmt.Errorf("fatal: scrypt salt length below minimum: value=%d, min=%d", len(s.Salt), scryptMinSaltLen)
 	}
 	if s.KeyLen < cryptocore.KeyLen {
-		return fmt.Errorf("Fatal: scrypt parameter KeyLen below minimum: value=%d, min=%d", s.KeyLen, cryptocore.KeyLen)
+		return fmt.Errorf("fatal: scrypt parameter KeyLen below minimum: value=%d, min=%d", s.KeyLen, cryptocore.KeyLen)
 	}
 	return nil
 }
diff --git a/internal/configfile/validate.go b/internal/configfile/validate.go
index ab8917d..5428a7b 100644
--- a/internal/configfile/validate.go
+++ b/internal/configfile/validate.go
@@ -9,7 +9,7 @@ import (
 // Validate that the combination of settings makes sense and is supported
 func (cf *ConfFile) Validate() error {
 	if cf.Version != contentenc.CurrentVersion {
-		return fmt.Errorf("Unsupported on-disk format %d", cf.Version)
+		return fmt.Errorf("unsupported on-disk format %d", cf.Version)
 	}
 	// scrypt params ok?
 	if err := cf.ScryptObject.validateParams(); err != nil {
@@ -18,13 +18,13 @@ func (cf *ConfFile) Validate() error {
 	// All feature flags that are in the config file are known?
 	for _, flag := range cf.FeatureFlags {
 		if !isFeatureFlagKnown(flag) {
-			return fmt.Errorf("Unknown feature flag %q", flag)
+			return fmt.Errorf("unknown feature flag %q", flag)
 		}
 	}
 	// File content encryption
 	{
 		if cf.IsFeatureFlagSet(FlagXChaCha20Poly1305) && cf.IsFeatureFlagSet(FlagAESSIV) {
-			return fmt.Errorf("Can't have both XChaCha20Poly1305 and AESSIV feature flags")
+			return fmt.Errorf("can't have both XChaCha20Poly1305 and AESSIV feature flags")
 		}
 		if cf.IsFeatureFlagSet(FlagAESSIV) && !cf.IsFeatureFlagSet(FlagGCMIV128) {
 
diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go
index 3005bf5..5bf0b3c 100644
--- a/internal/contentenc/content.go
+++ b/internal/contentenc/content.go
@@ -151,7 +151,7 @@ func (be *ContentEnc) DecryptBlock(ciphertext []byte, blockNo uint64, fileID []b
 
 	if len(ciphertext) < be.cryptoCore.IVLen {
 		tlog.Warn.Printf("DecryptBlock: Block is too short: %d bytes", len(ciphertext))
-		return nil, errors.New("Block is too short")
+		return nil, errors.New("block is too short")
 	}
 
 	// Extract nonce
diff --git a/internal/fusefrontend/prepare_syscall_test.go b/internal/fusefrontend/prepare_syscall_test.go
index acddaf3..e2c7d08 100644
--- a/internal/fusefrontend/prepare_syscall_test.go
+++ b/internal/fusefrontend/prepare_syscall_test.go
@@ -1,6 +1,7 @@
 package fusefrontend
 
 import (
+	"context"
 	"strings"
 	"syscall"
 	"testing"
@@ -22,13 +23,13 @@ func TestPrepareAtSyscall(t *testing.T) {
 	rn := newTestFS(args)
 	out := &fuse.EntryOut{}
 
-	child, errno := rn.Mkdir(nil, "dir1", 0700, out)
+	child, errno := rn.Mkdir(context.TODO(), "dir1", 0700, out)
 	if errno != 0 {
 		t.Fatal(errno)
 	}
 	rn.AddChild("dir1", child, false)
 	dir1 := toNode(child.Operations())
-	_, errno = dir1.Mkdir(nil, "dir2", 0700, out)
+	_, errno = dir1.Mkdir(context.TODO(), "dir2", 0700, out)
 	if errno != 0 {
 		t.Fatal(errno)
 	}
@@ -43,7 +44,7 @@ func TestPrepareAtSyscall(t *testing.T) {
 	syscall.Close(dirfd)
 
 	// Again, but populate the cache for "" by looking up a non-existing file
-	rn.Lookup(nil, "xyz1234", &fuse.EntryOut{})
+	rn.Lookup(context.TODO(), "xyz1234", &fuse.EntryOut{})
 	dirfd, cName, errno = rn.prepareAtSyscallMyself()
 	if errno != 0 {
 		t.Fatal(errno)
@@ -89,7 +90,7 @@ func TestPrepareAtSyscall(t *testing.T) {
 	syscall.Close(dirfd)
 
 	n255 := strings.Repeat("n", 255)
-	dir1.Mkdir(nil, n255, 0700, out)
+	dir1.Mkdir(context.TODO(), n255, 0700, out)
 	dirfd, cName, errno = dir1.prepareAtSyscall(n255)
 	if errno != 0 {
 		t.Fatal(errno)
@@ -116,13 +117,13 @@ func TestPrepareAtSyscallPlaintextnames(t *testing.T) {
 	rn := newTestFS(args)
 	out := &fuse.EntryOut{}
 
-	child, errno := rn.Mkdir(nil, "dir1", 0700, out)
+	child, errno := rn.Mkdir(context.TODO(), "dir1", 0700, out)
 	if errno != 0 {
 		t.Fatal(errno)
 	}
 	rn.AddChild("dir1", child, false)
 	dir1 := toNode(child.Operations())
-	_, errno = dir1.Mkdir(nil, "dir2", 0700, out)
+	_, errno = dir1.Mkdir(context.TODO(), "dir2", 0700, out)
 	if errno != 0 {
 		t.Fatal(errno)
 	}
diff --git a/internal/fusefrontend_reverse/excluder.go b/internal/fusefrontend_reverse/excluder.go
index 0faadfa..1cb4b80 100644
--- a/internal/fusefrontend_reverse/excluder.go
+++ b/internal/fusefrontend_reverse/excluder.go
@@ -1,7 +1,6 @@
 package fusefrontend_reverse
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 	"strings"
@@ -50,7 +49,7 @@ func getExclusionPatterns(args fusefrontend.Args) []string {
 
 // getLines reads a file and splits it into lines
 func getLines(file string) ([]string, error) {
-	buffer, err := ioutil.ReadFile(file)
+	buffer, err := os.ReadFile(file)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/fusefrontend_reverse/excluder_test.go b/internal/fusefrontend_reverse/excluder_test.go
index bb041ce..b44ddce 100644
--- a/internal/fusefrontend_reverse/excluder_test.go
+++ b/internal/fusefrontend_reverse/excluder_test.go
@@ -1,7 +1,6 @@
 package fusefrontend_reverse
 
 import (
-	"io/ioutil"
 	"os"
 	"reflect"
 	"testing"
@@ -23,7 +22,7 @@ func TestShouldPrefixExcludeValuesWithSlash(t *testing.T) {
 }
 
 func TestShouldReadExcludePatternsFromFiles(t *testing.T) {
-	tmpfile1, err := ioutil.TempFile("", "excludetest")
+	tmpfile1, err := os.CreateTemp("", "excludetest")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -31,7 +30,7 @@ func TestShouldReadExcludePatternsFromFiles(t *testing.T) {
 	defer os.Remove(exclude1)
 	defer tmpfile1.Close()
 
-	tmpfile2, err := ioutil.TempFile("", "excludetest")
+	tmpfile2, err := os.CreateTemp("", "excludetest")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/internal/nametransform/diriv.go b/internal/nametransform/diriv.go
index 7929c40..5dd4940 100644
--- a/internal/nametransform/diriv.go
+++ b/internal/nametransform/diriv.go
@@ -67,7 +67,7 @@ func fdReadDirIV(fd *os.File) (iv []byte, err error) {
 func WriteDirIVAt(dirfd int) error {
 	iv := cryptocore.RandBytes(DirIVLen)
 	// 0400 permissions: gocryptfs.diriv should never be modified after creation.
-	// Don't use "ioutil.WriteFile", it causes trouble on NFS:
+	// Don't use "os.WriteFile", it causes trouble on NFS:
 	// https://github.com/rfjakob/gocryptfs/commit/7d38f80a78644c8ec4900cc990bfb894387112ed
 	fd, err := syscallcompat.Openat(dirfd, DirIVFilename, os.O_WRONLY|os.O_CREATE|os.O_EXCL, dirivPerms)
 	if err != nil {
diff --git a/internal/nametransform/pad16.go b/internal/nametransform/pad16.go
index 833be0e..2c2466a 100644
--- a/internal/nametransform/pad16.go
+++ b/internal/nametransform/pad16.go
@@ -32,10 +32,10 @@ func pad16(orig []byte) (padded []byte) {
 func unPad16(padded []byte) ([]byte, error) {
 	oldLen := len(padded)
 	if oldLen == 0 {
-		return nil, errors.New("Empty input")
+		return nil, errors.New("empty input")
 	}
 	if oldLen%aes.BlockSize != 0 {
-		return nil, errors.New("Unaligned size")
+		return nil, errors.New("unaligned size")
 	}
 	// The last byte is always a padding byte
 	padByte := padded[oldLen-1]
@@ -43,20 +43,20 @@ func unPad16(padded []byte) ([]byte, error) {
 	padLen := int(padByte)
 	// Padding must be at least 1 byte
 	if padLen == 0 {
-		return nil, errors.New("Padding cannot be zero-length")
+		return nil, errors.New("padding cannot be zero-length")
 	}
 	// Padding more than 16 bytes make no sense
 	if padLen > aes.BlockSize {
-		return nil, fmt.Errorf("Padding too long, padLen=%d > 16", padLen)
+		return nil, fmt.Errorf("padding too long, padLen=%d > 16", padLen)
 	}
 	// Padding cannot be as long as (or longer than) the whole string,
 	if padLen >= oldLen {
-		return nil, fmt.Errorf("Padding too long, oldLen=%d >= padLen=%d", oldLen, padLen)
+		return nil, fmt.Errorf("padding too long, oldLen=%d >= padLen=%d", oldLen, padLen)
 	}
 	// All padding bytes must be identical
 	for i := oldLen - padLen; i < oldLen; i++ {
 		if padded[i] != padByte {
-			return nil, fmt.Errorf("Padding byte at i=%d is invalid", i)
+			return nil, fmt.Errorf("padding byte at i=%d is invalid", i)
 		}
 	}
 	newLen := oldLen - padLen
diff --git a/internal/speed/cpuinfo.go b/internal/speed/cpuinfo.go
index df3177d..636a4f0 100644
--- a/internal/speed/cpuinfo.go
+++ b/internal/speed/cpuinfo.go
@@ -1,7 +1,7 @@
 package speed
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"runtime"
 	"strings"
@@ -33,7 +33,7 @@ func cpuModelName() string {
 	if err != nil {
 		return ""
 	}
-	content, err := ioutil.ReadAll(f)
+	content, err := io.ReadAll(f)
 	if err != nil {
 		return ""
 	}
diff --git a/internal/syscallcompat/asuser_linux.go b/internal/syscallcompat/asuser_linux.go
index 804a898..39e3ff2 100644
--- a/internal/syscallcompat/asuser_linux.go
+++ b/internal/syscallcompat/asuser_linux.go
@@ -2,7 +2,7 @@ package syscallcompat
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"runtime"
 	"strconv"
 	"strings"
@@ -55,7 +55,7 @@ func asUser(f func() (int, error), context *fuse.Context) (int, error) {
 
 func getSupplementaryGroups(pid uint32) (gids []int) {
 	procPath := fmt.Sprintf("/proc/%d/task/%d/status", pid, pid)
-	blob, err := ioutil.ReadFile(procPath)
+	blob, err := os.ReadFile(procPath)
 	if err != nil {
 		return nil
 	}
diff --git a/internal/syscallcompat/getdents_test.go b/internal/syscallcompat/getdents_test.go
index eb670d6..c9e6a99 100644
--- a/internal/syscallcompat/getdents_test.go
+++ b/internal/syscallcompat/getdents_test.go
@@ -4,7 +4,6 @@
 package syscallcompat
 
 import (
-	"io/ioutil"
 	"os"
 	"runtime"
 	"strings"
@@ -49,13 +48,13 @@ func testGetdents(t *testing.T) {
 		getdentsUnderTest = emulateGetdents
 	}
 	// Fill a directory with filenames of length 1 ... 255
-	testDir, err := ioutil.TempDir(tmpDir, "TestGetdents")
+	testDir, err := os.MkdirTemp(tmpDir, "TestGetdents")
 	if err != nil {
 		t.Fatal(err)
 	}
 	for i := 1; i <= unix.NAME_MAX; i++ {
 		n := strings.Repeat("x", i)
-		err = ioutil.WriteFile(testDir+"/"+n, nil, 0600)
+		err = os.WriteFile(testDir+"/"+n, nil, 0600)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/internal/syscallcompat/main_test.go b/internal/syscallcompat/main_test.go
index ddf6bc4..7183f5a 100644
--- a/internal/syscallcompat/main_test.go
+++ b/internal/syscallcompat/main_test.go
@@ -2,7 +2,6 @@ package syscallcompat
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -23,7 +22,7 @@ func TestMain(m *testing.M) {
 		fmt.Println(err)
 		os.Exit(1)
 	}
-	tmpDir, err = ioutil.TempDir(parent, "syscallcompat")
+	tmpDir, err = os.MkdirTemp(parent, "syscallcompat")
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
-- 
cgit v1.2.3