From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 30 Aug 2022 13:17:07 +0000 (+0300)
Subject: io/ioutil is deprecated since Go 1.16
X-Git-Url: http://www.git.stargrave.org/?p=godlighty.git;a=commitdiff_plain;h=5cec1e322c642beeef9af0c53b1c9d977dd97cfd

io/ioutil is deprecated since Go 1.16
---

diff --git a/auth.go b/auth.go
index 3a950f6..83428c1 100644
--- a/auth.go
+++ b/auth.go
@@ -22,8 +22,8 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/http"
+	"os"
 	"strings"
 )
 
@@ -36,7 +36,7 @@ func performAuth(w http.ResponseWriter, r *http.Request, cfg *AuthCfg) (string,
 		w.WriteHeader(http.StatusUnauthorized)
 		return username, Unauthorized
 	}
-	data, err := ioutil.ReadFile(cfg.Passwords)
+	data, err := os.ReadFile(cfg.Passwords)
 	if err != nil {
 		return username, err
 	}
diff --git a/handler.go b/handler.go
index e6d63fc..d7037b4 100644
--- a/handler.go
+++ b/handler.go
@@ -23,7 +23,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
@@ -47,12 +47,12 @@ const (
 
 var (
 	gzPool = sync.Pool{
-		New: func() interface{} { return gzip.NewWriter(ioutil.Discard) },
+		New: func() interface{} { return gzip.NewWriter(io.Discard) },
 	}
 	zstdPool = sync.Pool{
 		New: func() interface{} {
 			w, err := zstd.NewWriter(
-				ioutil.Discard,
+				io.Discard,
 				zstd.WithEncoderLevel(zstd.SpeedDefault),
 			)
 			if err != nil {
@@ -200,7 +200,7 @@ IndexLookup:
 			}
 			var readme []byte
 			for _, f := range append(cfg.Readmes, Readme) {
-				readme, _ = ioutil.ReadFile(path.Join(pth, f))
+				readme, _ = os.ReadFile(path.Join(pth, f))
 				if readme != nil {
 					break
 				}
@@ -245,7 +245,7 @@ IndexLookup:
 		if meta4fi.Size() > meta4.MaxSize {
 			goto SkipMeta4
 		}
-		meta4Raw, err := ioutil.ReadFile(pth + meta4.Ext)
+		meta4Raw, err := os.ReadFile(pth + meta4.Ext)
 		if err != nil {
 			goto SkipMeta4
 		}
diff --git a/tls.go b/tls.go
index ff7d7d6..e30d4e3 100644
--- a/tls.go
+++ b/tls.go
@@ -23,8 +23,8 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"log"
+	"os"
 )
 
 var (
@@ -83,7 +83,7 @@ func loadCertificates(
 		log.Fatalln(err)
 	}
 	if cfg.CACert != "" {
-		data, err := ioutil.ReadFile(cfg.CACert)
+		data, err := os.ReadFile(cfg.CACert)
 		if err != nil {
 			log.Fatalln(err)
 		}
@@ -99,7 +99,7 @@ func loadCertificates(
 	(*hostToCertificate)[host] = &cert
 	pool := x509.NewCertPool()
 	for _, p := range cfg.ClientCAs {
-		data, err := ioutil.ReadFile(p)
+		data, err := os.ReadFile(p)
 		if err != nil {
 			log.Fatalln(err)
 		}