refactor: Replacer ioutil.ReadAll with io.ReadAll

ProtonMail · Jan 17, 2024 · 93256de · 93256de
1 parent 75630f2
commit 93256de
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 87 deletions.
diff --git a/openpgp/armor/armor_test.go b/openpgp/armor/armor_test.go
@@ -7,7 +7,7 @@ package armor
 import (
 	"bytes"
 	"hash/adler32"
-	"io/ioutil"
+	"io"
 	"testing"
 )
 
@@ -29,7 +29,7 @@ func TestDecodeEncode(t *testing.T) {
 		t.Errorf("result.Header: got:%#v", result.Header)
 	}
 
-	contents, err := ioutil.ReadAll(result.Body)
+	contents, err := io.ReadAll(result.Body)
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/openpgp/integration_tests/end_to_end_test.go b/openpgp/integration_tests/end_to_end_test.go
@@ -6,7 +6,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -42,7 +41,7 @@ func TestEndToEnd(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-	raw, err := ioutil.ReadAll(file)
+	raw, err := io.ReadAll(file)
 	if err != nil {
 		panic(err)
 	}
@@ -118,7 +117,7 @@ func decryptionTest(t *testing.T, vector testVector, sk openpgp.EntityList) {
 		t.Fatal(err)
 	}
 
-	body, err := ioutil.ReadAll(md.UnverifiedBody)
+	body, err := io.ReadAll(md.UnverifiedBody)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -218,7 +217,7 @@ func encDecTest(t *testing.T, from testVector, testVectors []testVector) {
 				t.Fatalf("Failed to find the signing Entity")
 			}
 
-			plaintext, err := ioutil.ReadAll(md.UnverifiedBody)
+			plaintext, err := io.ReadAll(md.UnverifiedBody)
 			if err != nil {
 				t.Fatalf("Error reading encrypted contents: %s", err)
 			}

diff --git a/openpgp/integration_tests/v2/end_to_end_test.go b/openpgp/integration_tests/v2/end_to_end_test.go
@@ -7,7 +7,6 @@ import (
 	"crypto"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -50,7 +49,7 @@ func TestEndToEnd(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-	raw, err := ioutil.ReadAll(file)
+	raw, err := io.ReadAll(file)
 	if err != nil {
 		panic(err)
 	}
@@ -128,7 +127,7 @@ func decryptionTest(t *testing.T, vector testVector, sk openpgp.EntityList) {
 		t.Fatal(err)
 	}
 
-	body, err := ioutil.ReadAll(md.UnverifiedBody)
+	body, err := io.ReadAll(md.UnverifiedBody)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -235,7 +234,7 @@ func encDecTest(t *testing.T, from testVector, testVectors []testVector) {
 				t.Fatalf("Failed to find the signing Entity")
 			}
 
-			plaintext, err := ioutil.ReadAll(md.UnverifiedBody)
+			plaintext, err := io.ReadAll(md.UnverifiedBody)
 			if err != nil {
 				t.Fatalf("Error reading encrypted contents: %s", err)
 			}

diff --git a/openpgp/packet/compressed_test.go b/openpgp/packet/compressed_test.go
@@ -9,7 +9,6 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"io"
-	"io/ioutil"
 	mathrand "math/rand"
 	"testing"
 )
@@ -31,7 +30,7 @@ func TestCompressed(t *testing.T) {
 		return
 	}
 
-	contents, err := ioutil.ReadAll(c.Body)
+	contents, err := io.ReadAll(c.Body)
 	if err != nil && err != io.EOF {
 		t.Error(err)
 		return
@@ -75,7 +74,7 @@ func TestCompressDecompressRandomizeFast(t *testing.T) {
 	if !ok {
 		t.Error("didn't find Compressed packet")
 	}
-	contents, err := ioutil.ReadAll(c.Body)
+	contents, err := io.ReadAll(c.Body)
 	if err != nil && err != io.EOF {
 		t.Error(err)
 	}

diff --git a/openpgp/packet/opaque.go b/openpgp/packet/opaque.go
@@ -7,7 +7,6 @@ package packet
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 
 	"github.com/ProtonMail/go-crypto/openpgp/errors"
 )
@@ -26,7 +25,7 @@ type OpaquePacket struct {
 }
 
 func (op *OpaquePacket) parse(r io.Reader) (err error) {
-	op.Contents, err = ioutil.ReadAll(r)
+	op.Contents, err = io.ReadAll(r)
 	return
 }
 

diff --git a/openpgp/packet/packet_test.go b/openpgp/packet/packet_test.go
@@ -9,7 +9,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"testing"
 
 	"github.com/ProtonMail/go-crypto/openpgp/errors"
@@ -101,7 +100,7 @@ var partialLengthReaderTests = []struct {
 func TestPartialLengthReader(t *testing.T) {
 	for i, test := range partialLengthReaderTests {
 		r := &partialLengthReader{readerFromHex(test.hexInput), 0, true}
-		out, err := ioutil.ReadAll(r)
+		out, err := io.ReadAll(r)
 		if test.err != nil {
 			if err != test.err {
 				t.Errorf("%d: expected different error got:%s want:%s", i, err, test.err)
@@ -173,7 +172,7 @@ func TestReadHeader(t *testing.T) {
 			continue
 		}
 
-		body, err := ioutil.ReadAll(contents)
+		body, err := io.ReadAll(contents)
 		if err != nil {
 			if !test.unexpectedEOF || err != io.ErrUnexpectedEOF {
 				t.Errorf("%d: unexpected error from contents: %s", i, err)

diff --git a/openpgp/packet/private_key.go b/openpgp/packet/private_key.go
@@ -15,7 +15,6 @@ import (
 	"crypto/subtle"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/big"
 	"strconv"
 	"time"
@@ -312,7 +311,7 @@ func (pk *PrivateKey) parse(r io.Reader) (err error) {
 			return
 		}
 	} else {
-		privateKeyData, err = ioutil.ReadAll(r)
+		privateKeyData, err = io.ReadAll(r)
 		if err != nil {
 			return
 		}

diff --git a/openpgp/packet/symmetric_key_encrypted_test.go b/openpgp/packet/symmetric_key_encrypted_test.go
@@ -9,7 +9,6 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"io"
-	"io/ioutil"
 	mathrand "math/rand"
 	"testing"
 
@@ -55,7 +54,7 @@ func TestDecryptSymmetricKeyAndEncryptedDataPacket(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		contents, err := ioutil.ReadAll(r)
+		contents, err := io.ReadAll(r)
 		if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
 			t.Fatal(err)
 		}

diff --git a/openpgp/packet/symmetrically_encrypted_test.go b/openpgp/packet/symmetrically_encrypted_test.go
@@ -11,7 +11,6 @@ import (
 	"encoding/hex"
 	goerrors "errors"
 	"io"
-	"io/ioutil"
 	"testing"
 
 	"github.com/ProtonMail/go-crypto/openpgp/errors"
@@ -49,7 +48,7 @@ func TestMDCReader(t *testing.T) {
 	for stride := 1; stride < len(mdcPlaintext)/2; stride++ {
 		r := &testReader{data: mdcPlaintext, stride: stride}
 		mdcReader := &seMDCReader{in: r, h: sha1.New()}
-		body, err := ioutil.ReadAll(mdcReader)
+		body, err := io.ReadAll(mdcReader)
 		if err != nil {
 			t.Errorf("stride: %d, error: %s", stride, err)
 			continue
@@ -69,7 +68,7 @@ func TestMDCReader(t *testing.T) {
 
 	r := &testReader{data: mdcPlaintext, stride: 2}
 	mdcReader := &seMDCReader{in: r, h: sha1.New()}
-	_, err := ioutil.ReadAll(mdcReader)
+	_, err := io.ReadAll(mdcReader)
 	if err != nil {
 		t.Errorf("corruption test, error: %s", err)
 		return
@@ -200,7 +199,7 @@ func TestAeadRfcVector(t *testing.T) {
 		return
 	}
 
-	decrypted, err := ioutil.ReadAll(aeadReader)
+	decrypted, err := io.ReadAll(aeadReader)
 	if err != nil {
 		t.Errorf("error when reading: %s", err)
 		return

diff --git a/openpgp/packet/userattribute.go b/openpgp/packet/userattribute.go
@@ -9,7 +9,6 @@ import (
 	"image"
 	"image/jpeg"
 	"io"
-	"io/ioutil"
 )
 
 const UserAttrImageSubpacket = 1
@@ -63,7 +62,7 @@ func NewUserAttribute(contents ...*OpaqueSubpacket) *UserAttribute {
 
 func (uat *UserAttribute) parse(r io.Reader) (err error) {
 	// RFC 4880, section 5.13
-	b, err := ioutil.ReadAll(r)
+	b, err := io.ReadAll(r)
 	if err != nil {
 		return
 	}

diff --git a/openpgp/packet/userid.go b/openpgp/packet/userid.go
@@ -6,7 +6,6 @@ package packet
 
 import (
 	"io"
-	"io/ioutil"
 	"strings"
 )
 
@@ -66,7 +65,7 @@ func NewUserId(name, comment, email string) *UserId {
 
 func (uid *UserId) parse(r io.Reader) (err error) {
 	// RFC 4880, section 5.11
-	b, err := ioutil.ReadAll(r)
+	b, err := io.ReadAll(r)
 	if err != nil {
 		return
 	}