Fix after gocritic -enableAll

base.go

@@ -2,7 +2,6 @@ package minitrust
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -11,8 +10,8 @@ import (
 )
 
 const (
-	trustedDirPerm = 0700
-	trustedKeyPerm = 0600
+	trustedDirPerm = 0o700
+	trustedKeyPerm = 0o600
 )
 
 type Base struct {
@@ -66,12 +65,6 @@ func (b *Base) AddTrustedPubKey(rawPubKey, comment string) error {
 		return err
 	}
 
-	content := strings.Join(
-		[]string{
-			commentPrefix + comment,
-			EncodePublicKey(pk),
-		},
-		"\n",
-	)
-	return ioutil.WriteFile(b.getKeyPath(pk.KeyId), []byte(content), trustedKeyPerm)
+	content := commentPrefix + comment + "\n" + EncodePublicKey(pk)
+	return os.WriteFile(b.getKeyPath(pk.KeyId), []byte(content), trustedKeyPerm)
 }

pubkey.go

@@ -18,7 +18,6 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"errors"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -59,7 +58,7 @@ func DecodeKeyFileContent(in string) (minisign.PublicKey, string, error) {
 
 // ReadKeyFile reads from keyPath and returns public key with untrusted comment.
 func ReadKeyFile(keyPath string) (minisign.PublicKey, string, error) {
-	content, err := ioutil.ReadFile(keyPath)
+	content, err := os.ReadFile(keyPath)
 	if os.IsNotExist(err) {
 		return minisign.PublicKey{}, "", errors.New("minitrust: public key doesn't exist in trusted directory.")
 	} else if err != nil {