replace deprecated functions

Author: 3ace

signatures/pdf_sign_external_google_cloud_kms.go

@@ -21,15 +21,14 @@ import (
 	"fmt"
 	"hash/crc32"
 	"io"
-	"io/ioutil"
 	"log"
 	"math/big"
 	"os"
 	"time"
 
 	kms "cloud.google.com/go/kms/apiv1"
+	kmspb "cloud.google.com/go/kms/apiv1/kmspb"
 	gcOption "google.golang.org/api/option"
-	kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	"github.com/unidoc/pkcs7"
@@ -104,7 +103,7 @@ func main() {
 	copy(pdfData[byteRange[1]:byteRange[2]], sig)
 
 	// Write output file.
-	if err := ioutil.WriteFile(outputPath, pdfData, os.ModePerm); err != nil {
+	if err := os.WriteFile(outputPath, pdfData, os.ModePerm); err != nil {
 		log.Fatalf("Fail: %v\n", err)
 	}
 
@@ -119,7 +118,7 @@ func generateSignedFile(inputPath string, handler model.SignatureHandler) ([]byt
 	if err != nil {
 		return nil, nil, err
 	}
-	defer file.Close()
+	defer func() { _ = file.Close() }()
 
 	reader, err := model.NewPdfReader(file)
 	if err != nil {
@@ -182,7 +181,7 @@ func getExternalSignatureAndSign(inputPath, credPath, keyName string) ([]byte, [
 	if err != nil {
 		return nil, nil, err
 	}
-	defer gcKmsSign.client.Close()
+	defer func() { _ = gcKmsSign.client.Close() }()
 
 	now := time.Now()
 

signatures/pdf_sign_pades_b_b.go

@@ -10,7 +10,6 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -48,7 +47,7 @@ func main() {
 	outputPath := args[5]
 
 	// Get private key and X509 certificate from the PFX file.
-	pfxData, err := ioutil.ReadFile(pfxPath)
+	pfxData, err := os.ReadFile(pfxPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}
@@ -59,7 +58,7 @@ func main() {
 	}
 
 	// Get cacert certificate from the PEM file.
-	caCertF, err := ioutil.ReadFile(pemPath)
+	caCertF, err := os.ReadFile(pemPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}

signatures/pdf_sign_pades_b_lt.go

@@ -11,7 +11,6 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -49,7 +48,7 @@ func main() {
 	outputPath := args[5]
 
 	// Get private key and X509 certificate from the PFX file.
-	pfxData, err := ioutil.ReadFile(pfxPath)
+	pfxData, err := os.ReadFile(pfxPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}
@@ -60,7 +59,7 @@ func main() {
 	}
 
 	// Get CA Certificate from the PEM file.
-	caCertF, err := ioutil.ReadFile(pemPath)
+	caCertF, err := os.ReadFile(pemPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}

signatures/pdf_sign_pades_b_lta.go

@@ -12,7 +12,6 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -50,7 +49,7 @@ func main() {
 	outputPath := args[5]
 
 	// Get private key and X509 certificate from the PFX file.
-	pfxData, err := ioutil.ReadFile(pfxPath)
+	pfxData, err := os.ReadFile(pfxPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}
@@ -61,7 +60,7 @@ func main() {
 	}
 
 	// Get CA Certificate from the PEM file.
-	caCertF, err := ioutil.ReadFile(pemPath)
+	caCertF, err := os.ReadFile(pemPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}

signatures/pdf_sign_pades_b_t.go

@@ -10,7 +10,6 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -48,7 +47,7 @@ func main() {
 	outputPath := args[5]
 
 	// Get private key and X509 certificate from the PFX file.
-	pfxData, err := ioutil.ReadFile(pfxPath)
+	pfxData, err := os.ReadFile(pfxPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}
@@ -59,7 +58,7 @@ func main() {
 	}
 
 	// Get cacert certificate from the PEM file.
-	caCertF, err := ioutil.ReadFile(pemPath)
+	caCertF, err := os.ReadFile(pemPath)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}

signatures/pdf_sign_pem_multicert.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"hash"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -82,7 +81,7 @@ func main() {
 
 func loadPrivateKey(privateKeyPath string) (*rsa.PrivateKey, error) {
 	// Read private key file contents.
-	privateKeyData, err := ioutil.ReadFile(privateKeyPath)
+	privateKeyData, err := os.ReadFile(privateKeyPath)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -101,7 +100,7 @@ func loadPrivateKey(privateKeyPath string) (*rsa.PrivateKey, error) {
 
 func loadCertificates(certPath string) (*x509.Certificate, *core.PdfObjectArray, error) {
 	// Read certificate file contents.
-	certData, err := ioutil.ReadFile(certPath)
+	certData, err := os.ReadFile(certPath)
 	if err != nil {
 		return nil, nil, err
 	}

signatures/pdf_sign_pkcs12.go

@@ -9,7 +9,6 @@ package main
 import (
 	"crypto/rsa"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -46,7 +45,7 @@ func main() {
 	outputPath := args[4]
 
 	// Get private key and X509 certificate from the P12 file.
-	pfxData, err := ioutil.ReadFile(p12Path)
+	pfxData, err := os.ReadFile(p12Path)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}

signatures/pdf_sign_timestamp.go

@@ -11,7 +11,6 @@ import (
 	"crypto"
 	"crypto/rsa"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -48,7 +47,7 @@ func main() {
 	outputPath := args[4]
 
 	// Get private key and X509 certificate from the P12 file.
-	pfxData, err := ioutil.ReadFile(p12Path)
+	pfxData, err := os.ReadFile(p12Path)
 	if err != nil {
 		log.Fatal("Fail: %v\n", err)
 	}

signatures/pdf_sign_twice_visible_annotation.go

@@ -13,7 +13,6 @@ import (
 	"crypto/x509"
 	"crypto/x509/pkix"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"math/big"
 	"os"
@@ -76,7 +75,7 @@ func main() {
 	}
 
 	// Write the resulting file to output.pdf file.
-	err = ioutil.WriteFile(outputPath, buf, 0666)
+	err = os.WriteFile(outputPath, buf, 0666)
 	if err != nil {
 		log.Fatalf("Fail: %v\n", err)
 	}