From 8bd4af2b3b90449b45f798a6ffaee31fc21881bc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 20 Nov 2022 13:49:48 +0100 Subject: [PATCH] transport: replace uses of deprecated io/ioutil Signed-off-by: Sebastiaan van Stijn --- transport/example/maclient/client.go | 4 ++-- transport/example/maserver/server.go | 4 ++-- transport/kp/key_provider.go | 10 +++++----- transport/roots/provider.go | 4 ++-- transport/roots/system/root_plan9.go | 4 ++-- transport/roots/system/root_unix.go | 9 +++++---- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/transport/example/maclient/client.go b/transport/example/maclient/client.go index 786a7c245..c3e3d2b6f 100644 --- a/transport/example/maclient/client.go +++ b/transport/example/maclient/client.go @@ -5,7 +5,7 @@ import ( "encoding/json" "flag" "fmt" - "io/ioutil" + "os" "github.com/cloudflare/cfssl/transport" "github.com/cloudflare/cfssl/transport/core" @@ -25,7 +25,7 @@ func main() { flag.Parse() var id = new(core.Identity) - data, err := ioutil.ReadFile(conf) + data, err := os.ReadFile(conf) if err != nil { exlib.Err(1, err, "reading config file") } diff --git a/transport/example/maserver/server.go b/transport/example/maserver/server.go index 3939102b6..124d5b543 100644 --- a/transport/example/maserver/server.go +++ b/transport/example/maserver/server.go @@ -3,8 +3,8 @@ package main import ( "encoding/json" "flag" - "io/ioutil" "net" + "os" "github.com/cloudflare/cfssl/log" "github.com/cloudflare/cfssl/transport" @@ -23,7 +23,7 @@ func main() { flag.Parse() var id = new(core.Identity) - data, err := ioutil.ReadFile(conf) + data, err := os.ReadFile(conf) if err != nil { exlib.Err(1, err, "reading config file") } diff --git a/transport/kp/key_provider.go b/transport/kp/key_provider.go index 0553b9955..7663bad56 100644 --- a/transport/kp/key_provider.go +++ b/transport/kp/key_provider.go @@ -22,7 +22,7 @@ import ( "crypto/x509" "encoding/pem" "errors" - "io/ioutil" + "os" "strings" "github.com/cloudflare/cfssl/csr" @@ -288,7 +288,7 @@ func (sp *StandardProvider) Load() (err error) { } }() - sp.internal.keyPEM, err = ioutil.ReadFile(sp.Paths.KeyFile) + sp.internal.keyPEM, err = os.ReadFile(sp.Paths.KeyFile) if err != nil { return } @@ -300,7 +300,7 @@ func (sp *StandardProvider) Load() (err error) { clearKey = false - sp.internal.certPEM, err = ioutil.ReadFile(sp.Paths.CertFile) + sp.internal.certPEM, err = os.ReadFile(sp.Paths.CertFile) if err != nil { return ErrCertificateUnavailable } @@ -384,12 +384,12 @@ func (sp *StandardProvider) Store() error { return errors.New("transport: provider does not have a key and certificate") } - err := ioutil.WriteFile(sp.Paths.CertFile, sp.internal.certPEM, 0644) + err := os.WriteFile(sp.Paths.CertFile, sp.internal.certPEM, 0644) if err != nil { return err } - return ioutil.WriteFile(sp.Paths.KeyFile, sp.internal.keyPEM, 0600) + return os.WriteFile(sp.Paths.KeyFile, sp.internal.keyPEM, 0600) } // X509KeyPair returns a tls.Certificate for the provider. diff --git a/transport/roots/provider.go b/transport/roots/provider.go index 4c3f599e8..6b1ff6c12 100644 --- a/transport/roots/provider.go +++ b/transport/roots/provider.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "crypto/x509" "errors" - "io/ioutil" + "os" "github.com/cloudflare/cfssl/helpers" "github.com/cloudflare/cfssl/transport/core" @@ -114,7 +114,7 @@ func TrustPEM(metadata map[string]string) ([]*x509.Certificate, error) { return nil, errors.New("transport: PEM source requires a source file") } - in, err := ioutil.ReadFile(sourceFile) + in, err := os.ReadFile(sourceFile) if err != nil { return nil, err } diff --git a/transport/roots/system/root_plan9.go b/transport/roots/system/root_plan9.go index d6e511c8f..6026564b3 100644 --- a/transport/roots/system/root_plan9.go +++ b/transport/roots/system/root_plan9.go @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build plan9 // +build plan9 package system import ( "crypto/x509" - "io/ioutil" ) // Possible certificate files; stop after finding one. @@ -18,7 +18,7 @@ var certFiles = []string{ func initSystemRoots() (roots []*x509.Certificate) { for _, file := range certFiles { - data, err := ioutil.ReadFile(file) + data, err := os.ReadFile(file) if err == nil { roots, _ = appendPEM(roots, data) return diff --git a/transport/roots/system/root_unix.go b/transport/roots/system/root_unix.go index 76dd8551e..62749c048 100644 --- a/transport/roots/system/root_unix.go +++ b/transport/roots/system/root_unix.go @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris // +build dragonfly freebsd linux nacl netbsd openbsd solaris package system import ( "crypto/x509" - "io/ioutil" + "os" ) // Possible directories with certificate files; stop after successfully @@ -20,7 +21,7 @@ var certDirectories = []string{ func initSystemRoots() []*x509.Certificate { var roots []*x509.Certificate for _, file := range certFiles { - data, err := ioutil.ReadFile(file) + data, err := os.ReadFile(file) if err == nil { roots, _ = appendPEM(roots, data) return roots @@ -28,14 +29,14 @@ func initSystemRoots() []*x509.Certificate { } for _, directory := range certDirectories { - fis, err := ioutil.ReadDir(directory) + fis, err := os.ReadDir(directory) if err != nil { continue } rootsAdded := false for _, fi := range fis { var ok bool - data, err := ioutil.ReadFile(directory + "/" + fi.Name()) + data, err := os.ReadFile(directory + "/" + fi.Name()) if err == nil { if roots, ok = appendPEM(roots, data); ok { rootsAdded = true