io/ioutil is deprecated since Go 1.16

diff --git a/netrc.go b/netrc.go
index 8cc6560feea63bab82c3d115ba7beb1a9fd706cd..d8877b4b9f41005f443f30937ed4ebdcb1cbe719 100644 (file)
--- a/netrc.go
+++ b/netrc.go
@@ -3,7 +3,6 @@
 package tofuproxy
 
 import (
-       "io/ioutil"
        "log"
        "os"
        "path/filepath"
@@ -19,7 +18,7 @@ func findInNetrc(host string) (string, string) {
                }
                netrcPath = filepath.Join(homeDir, ".netrc")
        }
-       data, err := ioutil.ReadFile(netrcPath)
+       data, err := os.ReadFile(netrcPath)
        if err != nil {
                if os.IsNotExist(err) {
                        return "", ""

diff --git a/rounds/transcodeJXL.go b/rounds/transcodeJXL.go
index f88eab3d22ed57d7370dfaee33219eb924c128dd..e0574679fea4d55080e9f9664602ee74d033e3e4 100644 (file)
--- a/rounds/transcodeJXL.go
+++ b/rounds/transcodeJXL.go
@@ -21,7 +21,6 @@ package rounds
 import (
        "fmt"
        "io"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -39,7 +38,7 @@ func transcodeCmd2Png(
        if resp.Header.Get("Content-Type") != contentType {
                return true, nil
        }
-       tmpFd, err := ioutil.TempFile("", "tofuproxy.*."+ext)
+       tmpFd, err := os.CreateTemp("", "tofuproxy.*."+ext)
        if err != nil {
                log.Fatalln(err)
        }
@@ -58,7 +57,7 @@ func transcodeCmd2Png(
        if err != nil {
                return false, err
        }
-       data, err := ioutil.ReadFile(dstFn)
+       data, err := os.ReadFile(dstFn)
        if err != nil {
                return false, err
        }

diff --git a/rounds/transcodeWebP.go b/rounds/transcodeWebP.go
index fa0af4f6663050b74d13f737bdaa5c63de2269f9..53654ef965a4e127002c37be6b79b2dc18160fd8 100644 (file)
--- a/rounds/transcodeWebP.go
+++ b/rounds/transcodeWebP.go
@@ -21,7 +21,6 @@ package rounds
 import (
        "fmt"
        "io"
-       "io/ioutil"
        "log"
        "net/http"
        "os"
@@ -46,7 +45,7 @@ func RoundTranscodeWebP(
        if resp.Header.Get("Content-Type") != "image/webp" || isXombrero(req) {
                return true, nil
        }
-       tmpFd, err := ioutil.TempFile("", "tofuproxy.*.webp")
+       tmpFd, err := os.CreateTemp("", "tofuproxy.*.webp")
        if err != nil {
                log.Fatalln(err)
        }

diff --git a/tls/tlsauth.go b/tls/tlsauth.go
index c93eb3df5a47581c1a1f65657c7d88dc60c656bd..131dff2ad3926643ca4c4ca9ab7aef6c74389ded 100644 (file)
--- a/tls/tlsauth.go
+++ b/tls/tlsauth.go
@@ -122,7 +122,7 @@ foreach sigScheme {%s} {
                })
                b.WriteString(fmt.Sprintf(".lb insert end \"%d: %s\"\n", i+1, cert.Subject))
        }
-       // ioutil.WriteFile("/tmp/tls-auth-dialog.tcl", b.Bytes(), 0666)
+       // os.WriteFile("/tmp/tls-auth-dialog.tcl", b.Bytes(), 0666)
        cmd := exec.Command(CmdWish)
        cmd.Stdin = &b
        out, err := cmd.Output()

diff --git a/tls/verify.go b/tls/verify.go
index a63fb4a2441082ac0c63dcd09ceb8ffb27bf0f75..ea789e46af37497975252368e6ba42ab5ea98d58 100644 (file)
--- a/tls/verify.go
+++ b/tls/verify.go
@@ -251,7 +251,7 @@ func verifyCert(
                ))
                b.WriteString(VerifyDialog)
                cmd := exec.Command(CmdWish)
-               // ioutil.WriteFile("/tmp/verify-dialog.tcl", b.Bytes(), 0666)
+               // os.WriteFile("/tmp/verify-dialog.tcl", b.Bytes(), 0666)
                cmd.Stdin = &b
                err = cmd.Run()
                exitError, ok := err.(*exec.ExitError)