@@ -13,7 +13,6 @@ import (
1313 "encoding/pem"
1414 "flag"
1515 "fmt"
16- "io/ioutil"
1716 "log"
1817 "math"
1918 "math/big"
@@ -37,8 +36,8 @@ type issuer struct {
3736}
3837
3938func getIssuer (keyFile , certFile string ) (* issuer , error ) {
40- keyContents , keyErr := ioutil .ReadFile (keyFile )
41- certContents , certErr := ioutil .ReadFile (certFile )
39+ keyContents , keyErr := os .ReadFile (keyFile )
40+ certContents , certErr := os .ReadFile (certFile )
4241 if os .IsNotExist (keyErr ) && os .IsNotExist (certErr ) {
4342 err := makeIssuer (keyFile , certFile )
4443 if err != nil {
@@ -108,9 +107,6 @@ func makeKey(filename string) (*rsa.PrivateKey, error) {
108107 return nil , err
109108 }
110109 der := x509 .MarshalPKCS1PrivateKey (key )
111- if err != nil {
112- return nil , err
113- }
114110 file , err := os .OpenFile (filename , os .O_CREATE | os .O_EXCL | os .O_WRONLY , 0600 )
115111 if err != nil {
116112 return nil , err
@@ -192,7 +188,7 @@ func publicKeysEqual(a, b interface{}) (bool, error) {
192188 if err != nil {
193189 return false , err
194190 }
195- return bytes .Compare (aBytes , bBytes ) == 0 , nil
191+ return bytes .Equal (aBytes , bBytes ), nil
196192}
197193
198194func calculateSKID (pubKey crypto.PublicKey ) ([]byte , error ) {
0 commit comments