Migrate remaining uses of io/ioutil
See https://go.dev/doc/go1.16#ioutil
Change-Id: Ib0fa34a745f1d1515729a0eead96fe5dfcf86a21
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/77387
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/util/fipstools/acvp/acvptool/acvp.go b/util/fipstools/acvp/acvptool/acvp.go
index 0e04ddc..dcaf542 100644
--- a/util/fipstools/acvp/acvptool/acvp.go
+++ b/util/fipstools/acvp/acvptool/acvp.go
@@ -29,7 +29,6 @@
"flag"
"fmt"
"io"
- "io/ioutil"
"log"
"net/http"
neturl "net/url"
@@ -587,7 +586,7 @@
var results []nistUploadResult
// Read directory, identify, and process all files.
- files, err := ioutil.ReadDir(directory)
+ files, err := os.ReadDir(directory)
if err != nil {
log.Fatalf("Unable to read directory: %s", err)
}
@@ -595,7 +594,7 @@
for _, file := range files {
// Add contents of the result file to results.
filePath := filepath.Join(directory, file.Name())
- content, err := ioutil.ReadFile(filePath)
+ content, err := os.ReadFile(filePath)
if err != nil {
log.Fatalf("Cannot open input: %s", err)
}
diff --git a/util/fipstools/hex-search-modify.go b/util/fipstools/hex-search-modify.go
index 7484f25..f52b9c0 100644
--- a/util/fipstools/hex-search-modify.go
+++ b/util/fipstools/hex-search-modify.go
@@ -32,7 +32,6 @@
"bytes"
"encoding/hex"
"fmt"
- "io/ioutil"
"os"
)
@@ -53,7 +52,7 @@
}
// Read file contents
- content, err := ioutil.ReadFile(filePath)
+ content, err := os.ReadFile(filePath)
if err != nil {
fmt.Fprintln(os.Stderr, "Error reading file:", err)
os.Exit(1)
