Skip to content

Commit

Permalink
Remove ioutil usage
Browse files Browse the repository at this point in the history
Signed-off-by: Derek Collison <derek@nats.io>
  • Loading branch information
derekcollison committed Nov 30, 2022
1 parent f2ecfe3 commit 31a0779
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions nk/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2018-2019 The NATS Authors
// Copyright 2018-2022 The NATS Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
Expand All @@ -21,7 +21,6 @@ import (
"flag"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"runtime"
Expand Down Expand Up @@ -130,7 +129,7 @@ func sign(fname, keyFile string) {
log.Fatal(err)
}

content, err := ioutil.ReadFile(fname)
content, err := os.ReadFile(fname)
if err != nil {
log.Fatal(err)
}
Expand All @@ -153,15 +152,15 @@ func verify(fname, keyFile, pubFile, sigFile string) {
var kp nkeys.KeyPair
if keyFile != "" {
var seed []byte
seed, err = ioutil.ReadFile(keyFile)
seed, err = os.ReadFile(keyFile)
if err != nil {
log.Fatal(err)
}
kp, err = nkeys.FromSeed(seed)
} else {
// Public Key
var public []byte
public, err = ioutil.ReadFile(pubFile)
public, err = os.ReadFile(pubFile)
if err != nil {
log.Fatal(err)
}
Expand All @@ -171,12 +170,12 @@ func verify(fname, keyFile, pubFile, sigFile string) {
log.Fatal(err)
}

content, err := ioutil.ReadFile(fname)
content, err := os.ReadFile(fname)
if err != nil {
log.Fatal(err)
}

sigEnc, err := ioutil.ReadFile(sigFile)
sigEnc, err := os.ReadFile(sigFile)
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -288,7 +287,7 @@ func createVanityKey(keyType, vanity, entropy string, max int) nkeys.KeyPair {

func readKeyFile(filename string) []byte {
var key []byte
contents, err := ioutil.ReadFile(filename)
contents, err := os.ReadFile(filename)
if err != nil {
log.Fatal(err)
}
Expand Down

0 comments on commit 31a0779

Please sign in to comment.