eiac/crypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: replace io/ioutil with io and os package

Browse Source 
For golang/go#45557

Change-Id: I447530cc66896aef7a8d528ccb8d095b80e3cf47
GitHub-Last-Rev: 5f385ff46487ac318bd1147cdbbd26bb0ffd0426
GitHub-Pull-Request: golang/crypto#230
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/430797
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Meng Zhuo <mzh@golangcn.org>
Run-TryBot: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Cherry Mui <cherryyz@google.com>
This commit is contained in:
cui fliter
2022-09-19 17:36:07 +00:00
committed by Gopher Robot
parent c86fa9a7ed
commit 35f4265a4b
30 changed files with 60 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssh/cipher.go
+1 -2
View File
@@ -15,7 +15,6 @@ import (
"fmt"
"hash"
"io"
"io/ioutil"
"golang.org/x/crypto/chacha20"
"golang.org/x/crypto/internal/poly1305"
@@ -497,7 +496,7 @@ func (c *cbcCipher) readCipherPacket(seqNum uint32, r io.Reader) ([]byte, error)
// data, to make distinguishing between
// failing MAC and failing length check more
// difficult.
io.CopyN(ioutil.Discard, r, int64(c.oracleCamouflage))
io.CopyN(io.Discard, r, int64(c.oracleCamouflage))
}
}
return p, err
ssh/example_test.go
+3 -4
View File
@@ -8,7 +8,6 @@ import (
"bufio"
"bytes"
"fmt"
"io/ioutil"
"log"
"net"
"net/http"
@@ -24,7 +23,7 @@ func ExampleNewServerConn() {
// Public key authentication is done by comparing
// the public key of a received connection
// with the entries in the authorized_keys file.
authorizedKeysBytes, err := ioutil.ReadFile("authorized_keys")
authorizedKeysBytes, err := os.ReadFile("authorized_keys")
if err != nil {
log.Fatalf("Failed to load authorized_keys, err: %v", err)
}
@@ -67,7 +66,7 @@ func ExampleNewServerConn() {
},
}
privateBytes, err := ioutil.ReadFile("id_rsa")
privateBytes, err := os.ReadFile("id_rsa")
if err != nil {
log.Fatal("Failed to load private key: ", err)
}
@@ -225,7 +224,7 @@ func ExamplePublicKeys() {
//
// If you have an encrypted private key, the crypto/x509 package
// can be used to decrypt it.
key, err := ioutil.ReadFile("/home/user/.ssh/id_rsa")
key, err := os.ReadFile("/home/user/.ssh/id_rsa")
if err != nil {
log.Fatalf("unable to read private key: %v", err)
}
ssh/mux_test.go
+3 -4
View File
@@ -6,7 +6,6 @@ package ssh
import (
"io"
"io/ioutil"
"sync"
"testing"
"time"
@@ -73,14 +72,14 @@ func TestMuxChannelExtendedThreadSafety(t *testing.T) {
rd.Add(2)
go func() {
c, err := ioutil.ReadAll(reader)
c, err := io.ReadAll(reader)
if string(c) != magic {
t.Fatalf("stdout read got %q, want %q (error %s)", c, magic, err)
}
rd.Done()
}()
go func() {
c, err := ioutil.ReadAll(reader.Stderr())
c, err := io.ReadAll(reader.Stderr())
if string(c) != magic {
t.Fatalf("stderr read got %q, want %q (error %s)", c, magic, err)
}
@@ -670,7 +669,7 @@ func TestZeroWindowAdjust(t *testing.T) {
}()
want := "helloworld"
c, _ := ioutil.ReadAll(b)
c, _ := io.ReadAll(b)
if string(c) != want {
t.Errorf("got %q want %q", c, want)
}
ssh/session.go
+3 -4
View File
@@ -13,7 +13,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"sync"
)
@@ -124,7 +123,7 @@ type Session struct {
// output and error.
//
// If either is nil, Run connects the corresponding file
// descriptor to an instance of ioutil.Discard. There is a
// descriptor to an instance of io.Discard. There is a
// fixed amount of buffering that is shared for the two streams.
// If either blocks it may eventually cause the remote
// command to block.
@@ -506,7 +505,7 @@ func (s *Session) stdout() {
return
}
if s.Stdout == nil {
s.Stdout = ioutil.Discard
s.Stdout = io.Discard
}
s.copyFuncs = append(s.copyFuncs, func() error {
_, err := io.Copy(s.Stdout, s.ch)
@@ -519,7 +518,7 @@ func (s *Session) stderr() {
return
}
if s.Stderr == nil {
s.Stderr = ioutil.Discard
s.Stderr = io.Discard
}
s.copyFuncs = append(s.copyFuncs, func() error {
_, err := io.Copy(s.Stderr, s.ch.Stderr())
ssh/session_test.go
+3 -4
View File
@@ -11,7 +11,6 @@ import (
crypto_rand "crypto/rand"
"errors"
"io"
"io/ioutil"
"math/rand"
"net"
"testing"
@@ -531,7 +530,7 @@ func sendSignal(signal string, ch Channel, t *testing.T) {
func discardHandler(ch Channel, t *testing.T) {
defer ch.Close()
io.Copy(ioutil.Discard, ch)
io.Copy(io.Discard, ch)
}
func echoHandler(ch Channel, in <-chan *Request, t *testing.T) {
@@ -606,7 +605,7 @@ func TestClientWriteEOF(t *testing.T) {
}
stdin.Close()
res, err := ioutil.ReadAll(stdout)
res, err := io.ReadAll(stdout)
if err != nil {
t.Fatalf("Read failed: %v", err)
}
@@ -618,7 +617,7 @@ func TestClientWriteEOF(t *testing.T) {
func simpleEchoHandler(ch Channel, in <-chan *Request, t *testing.T) {
defer ch.Close()
data, err := ioutil.ReadAll(ch)
data, err := io.ReadAll(ch)
if err != nil {
t.Errorf("handler read error: %v", err)
}
ssh/test/dial_unix_test.go
+1 -2
View File
@@ -12,7 +12,6 @@ package test
import (
"fmt"
"io"
"io/ioutil"
"net"
"strings"
"testing"
@@ -55,7 +54,7 @@ func testDial(t *testing.T, n, listenAddr string, x dialTester) {
}
x.TestClientConn(t, conn)
defer conn.Close()
b, err := ioutil.ReadAll(conn)
b, err := io.ReadAll(conn)
if err != nil {
t.Fatalf("ReadAll: %v", err)
}
ssh/test/forward_unix_test.go
+1 -2
View File
@@ -11,7 +11,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"math/rand"
"net"
"testing"
@@ -58,7 +57,7 @@ func testPortForward(t *testing.T, n, listenAddr string) {
readChan := make(chan []byte)
go func() {
data, _ := ioutil.ReadAll(netConn)
data, _ := io.ReadAll(netConn)
readChan <- data
}()
ssh/test/test_unix_test.go
+3 -4
View File
@@ -14,7 +14,6 @@ import (
"crypto/rand"
"encoding/base64"
"fmt"
"io/ioutil"
"log"
"net"
"os"
@@ -151,7 +150,7 @@ func clientConfig() *ssh.ClientConfig {
// is used for connecting the Go SSH client with sshd without opening
// ports.
func unixConnection() (*net.UnixConn, *net.UnixConn, error) {
dir, err := ioutil.TempDir("", "unixConnection")
dir, err := os.MkdirTemp("", "unixConnection")
if err != nil {
return nil, nil, err
}
@@ -316,7 +315,7 @@ func newServerForConfig(t *testing.T, config string, configVars map[string]strin
if uname == "root" {
t.Skip("skipping test because current user is root")
}
dir, err := ioutil.TempDir("", "sshtest")
dir, err := os.MkdirTemp("", "sshtest")
if err != nil {
t.Fatal(err)
}
@@ -365,7 +364,7 @@ func newServerForConfig(t *testing.T, config string, configVars map[string]strin
}
func newTempSocket(t *testing.T) (string, func()) {
dir, err := ioutil.TempDir("", "socket")
dir, err := os.MkdirTemp("", "socket")
if err != nil {
t.Fatal(err)
}