From: Sergey Matveev Date: Fri, 8 Dec 2023 07:31:11 +0000 (+0300) Subject: Unnecessary *ln X-Git-Tag: v5.14.0~3 X-Git-Url: http://www.git.cypherpunks.ru/?p=gogost.git;a=commitdiff_plain;h=7cc9f15ef1a21bc6d42302a65a29453f0914502b Unnecessary *ln --- diff --git a/cmd/cer-dane-hash/main.go b/cmd/cer-dane-hash/main.go index 5486a54..c81a222 100644 --- a/cmd/cer-dane-hash/main.go +++ b/cmd/cer-dane-hash/main.go @@ -32,15 +32,15 @@ func main() { flag.Parse() data, err := io.ReadAll(os.Stdin) if err != nil { - log.Fatalln(err) + log.Fatal(err) } b, _ := pem.Decode(data) if b == nil || b.Type != "CERTIFICATE" { - log.Fatalln("no CERTIFICATE") + log.Fatal("no CERTIFICATE") } cer, err := x509.ParseCertificate(b.Bytes) if err != nil { - log.Fatalln(err) + log.Fatal(err) } h := sha256.Sum256(cer.RawSubjectPublicKeyInfo) fmt.Println(hex.EncodeToString(h[:])) diff --git a/cmd/cer-selfsigned-example/main.go b/cmd/cer-selfsigned-example/main.go index 2eafe64..5f52ad7 100644 --- a/cmd/cer-selfsigned-example/main.go +++ b/cmd/cer-selfsigned-example/main.go @@ -77,7 +77,7 @@ func main() { log.SetFlags(log.Lshortfile) if *cn == "" { - log.Fatalln("no CommonName is set") + log.Fatal("no CommonName is set") } var curve *gost3410.Curve var sigAlg x509.SignatureAlgorithm @@ -104,7 +104,7 @@ func main() { curve = gost3410.CurveIdtc26gost341012512paramSetC() sigAlg = x509.GOST512 default: - log.Fatalln("unknown curve name") + log.Fatal("unknown curve name") } var err error @@ -113,7 +113,7 @@ func main() { if *issueWith != "" { caCer, caPrv, err = loadKeypair(*issueWith) if err != nil { - log.Fatalln(err) + log.Fatal(err) } sigAlg = caCer.SignatureAlgorithm } @@ -122,15 +122,15 @@ func main() { if *reuseKey == "" { prvRaw := make([]byte, curve.PointSize()) if _, err := io.ReadFull(rand.Reader, prvRaw); err != nil { - log.Fatalln(err) + log.Fatal(err) } prv, err = gost3410.NewPrivateKey(curve, prvRaw) if err != nil { - log.Fatalln(err) + log.Fatal(err) } data, err := x509.MarshalPKCS8PrivateKey(prv) if err != nil { - log.Fatalln(err) + log.Fatal(err) } data = pem.EncodeToMemory(&pem.Block{Type: PEMKey, Bytes: data}) if *outKey == "" { @@ -139,7 +139,7 @@ func main() { err = os.WriteFile(*outKey, data, 0o666) } if err != nil { - log.Fatalln(err) + log.Fatal(err) } if *onlyKey { return @@ -147,7 +147,7 @@ func main() { } else { _, prv, err = loadKeypair(*reuseKey) if err != nil { - log.Fatalln(err) + log.Fatal(err) } } @@ -162,11 +162,11 @@ func main() { if *serial == -1 { data := make([]byte, 16, gost34112012256.Size) if _, err = io.ReadFull(rand.Reader, data); err != nil { - log.Fatalln(err) + log.Fatal(err) } hasher := gost34112012256.New() if _, err = hasher.Write(data); err != nil { - log.Fatalln(err) + log.Fatal(err) } data = hasher.Sum(data[:0]) sn = sn.SetBytes(data[:20]) @@ -181,11 +181,11 @@ func main() { pub, err := prv.(*gost3410.PrivateKey).PublicKey() if err != nil { - log.Fatalln(err) + log.Fatal(err) } hasher := gost34112012256.New() if _, err = hasher.Write(pub.Raw()); err != nil { - log.Fatalln(err) + log.Fatal(err) } spki := hasher.Sum(nil) spki = spki[:20] @@ -217,7 +217,7 @@ func main() { &gost3410.PrivateKeyReverseDigest{Prv: caPrv.(*gost3410.PrivateKey)}, ) if err != nil { - log.Fatalln(err) + log.Fatal(err) } data = pem.EncodeToMemory(&pem.Block{Type: PEMCer, Bytes: data}) if *outCer == "" { @@ -226,6 +226,6 @@ func main() { err = os.WriteFile(*outCer, data, 0o666) } if err != nil { - log.Fatalln(err) + log.Fatal(err) } }