PEM format check should query whole file for expected header (#1006)

* rand.Seed(SEED) deprecated and unnecessary since golang 1.20
smallstep · Aug 17, 2023 · 6020d95 · 6020d95
1 parent ec31caa
commit 6020d95
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/cmd/step/main.go b/cmd/step/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"errors"
 	"fmt"
-	"math/rand"
 	"os"
 	"reflect"
 	"regexp"
@@ -54,7 +53,6 @@ var BuildTime = "N/A"
 func init() {
 	step.Set("Smallstep CLI", Version, BuildTime)
 	ca.UserAgent = step.Version()
-	rand.Seed(time.Now().UnixNano())
 }
 
 func main() {

diff --git a/command/certificate/fingerprint.go b/command/certificate/fingerprint.go
@@ -21,7 +21,7 @@ func fingerprintCommand() cli.Command {
 		Action: cli.ActionFunc(fingerprintAction),
 		Usage:  "print the fingerprint of a certificate",
 		UsageText: `**step certificate fingerprint** <crt-file>
-[**--bundle**] [**--roots**=<root-bundle>] [**--servername**=<servername>] 
+[**--bundle**] [**--roots**=<root-bundle>] [**--servername**=<servername>]
 [**--format**=<format>] [**--sha1**] [**--insecure**]`,
 		Description: `**step certificate fingerprint** reads a certificate and prints to STDOUT the
 certificate SHA256 of the raw certificate.

diff --git a/command/certificate/format.go b/command/certificate/format.go
@@ -85,7 +85,7 @@ func formatAction(ctx *cli.Context) error {
 	}
 
 	switch {
-	case bytes.HasPrefix(crtBytes, []byte("-----BEGIN ")): // PEM format
+	case bytes.Contains(crtBytes, []byte("-----BEGIN ")): // PEM format
 		ob, err = decodeCertificatePem(crtBytes)
 		if err != nil {
 			return err

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/smallstep/cli
 
-go 1.19
+go 1.20
 
 require (
 	github.com/Microsoft/go-winio v0.6.1