Skip to content

Commit 1f6f7b6

Browse files
committed
secsipidx: replaced deprecated ioutil.ReadFile() with os.ReadFile()
1 parent 5912b3d commit 1f6f7b6

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

secsipid/secsipid.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ func SJWTPubKeyVerify(pubKey []byte) (int, error) {
306306
}
307307
var certsCA []byte
308308
// Read in the cert file
309-
certsCA, err = ioutil.ReadFile(globalLibOptions.certCAFile)
309+
certsCA, err = os.ReadFile(globalLibOptions.certCAFile)
310310
if err != nil {
311311
return SJWTRetErrCertReadCAFile, errors.New("failed to read CA file")
312312
}
@@ -326,7 +326,7 @@ func SJWTPubKeyVerify(pubKey []byte) (int, error) {
326326
}
327327
var certsCA []byte
328328
// Read in the cert file
329-
certsCA, err = ioutil.ReadFile(globalLibOptions.certCAInter)
329+
certsCA, err = os.ReadFile(globalLibOptions.certCAInter)
330330
if err != nil {
331331
return SJWTRetErrCertReadCAInter, errors.New("failed to read intermediate CA file")
332332
}
@@ -369,7 +369,7 @@ func SJWTPubKeyVerify(pubKey []byte) (int, error) {
369369
rootCRL = nil
370370
var certsCRLData []byte
371371
// Read in the cert file
372-
certsCRLData, err = ioutil.ReadFile(globalLibOptions.certCRLFile)
372+
certsCRLData, err = os.ReadFile(globalLibOptions.certCRLFile)
373373
if err != nil {
374374
return SJWTRetErrCertReadCRLFile, errors.New("failed to read CRL file")
375375
}
@@ -484,7 +484,7 @@ func SJWTGetURLCachedContent(urlVal string) ([]byte, error) {
484484
os.Remove(filePath)
485485
return nil, nil
486486
}
487-
return ioutil.ReadFile(filePath)
487+
return os.ReadFile(filePath)
488488
}
489489

490490
// SJWTSetURLCachedContent --
@@ -686,7 +686,7 @@ func SJWTEncodeText(headerJSON string, payloadJSON string, prvkeyPath string) (s
686686
var signatureValue string
687687
var ecdsaPrvKey *ecdsa.PrivateKey
688688

689-
prvkey, _ := ioutil.ReadFile(prvkeyPath)
689+
prvkey, _ := os.ReadFile(prvkeyPath)
690690

691691
if ecdsaPrvKey, ret, err = SJWTParseECPrivateKeyFromPEM(prvkey); err != nil {
692692
return "", ret, err
@@ -776,10 +776,10 @@ func SJWTCheckIdentityPKMode(identityVal string, expireVal int, pubkeyVal string
776776
pubkey, ret, err = SJWTGetURLContent(pubkeyVal, timeoutVal)
777777
} else if strings.HasPrefix(pubkeyVal, "file://") {
778778
fileUrl, _ := url.Parse(pubkeyVal)
779-
pubkey, err = ioutil.ReadFile(fileUrl.Path)
779+
pubkey, err = os.ReadFile(fileUrl.Path)
780780
ret = SJWTRetErrFileRead
781781
} else {
782-
pubkey, err = ioutil.ReadFile(pubkeyVal)
782+
pubkey, err = os.ReadFile(pubkeyVal)
783783
ret = SJWTRetErrFileRead
784784
}
785785
if err != nil {
@@ -1004,7 +1004,7 @@ func SJWTGetIdentity(origTN string, destTN string, attestVal string, origID stri
10041004
var prvkey []byte
10051005
var err error
10061006

1007-
prvkey, err = ioutil.ReadFile(prvkeyPath)
1007+
prvkey, err = os.ReadFile(prvkeyPath)
10081008
if err != nil {
10091009
return "", SJWTRetErrFileRead, fmt.Errorf("Unable to read private key file: %v", err)
10101010
}

0 commit comments

Comments
 (0)