From 3a8743d511937b7e3173bcaf0442077b0a6832dd Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Wed, 6 Dec 2023 10:20:49 -0800 Subject: [PATCH] cmd/nebula-cert: fix clobbered error (#1032) * cmd/nebula-cert: fix clobbered error Signed-off-by: Lars Lehtonen * apply suggestions from Nate This makes it much clearer what is happening in the code --------- Signed-off-by: Lars Lehtonen Co-authored-by: Wade Simmons --- cmd/nebula-cert/ca.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/nebula-cert/ca.go b/cmd/nebula-cert/ca.go index c538b93..69df4ab 100644 --- a/cmd/nebula-cert/ca.go +++ b/cmd/nebula-cert/ca.go @@ -212,22 +212,22 @@ func ca(args []string, out io.Writer, errOut io.Writer, pr PasswordReader) error return fmt.Errorf("error while signing: %s", err) } + var b []byte if *cf.encryption { - b, err := cert.EncryptAndMarshalSigningPrivateKey(curve, rawPriv, passphrase, kdfParams) + b, err = cert.EncryptAndMarshalSigningPrivateKey(curve, rawPriv, passphrase, kdfParams) if err != nil { return fmt.Errorf("error while encrypting out-key: %s", err) } - - err = os.WriteFile(*cf.outKeyPath, b, 0600) } else { - err = os.WriteFile(*cf.outKeyPath, cert.MarshalSigningPrivateKey(curve, rawPriv), 0600) + b = cert.MarshalSigningPrivateKey(curve, rawPriv) } + err = os.WriteFile(*cf.outKeyPath, b, 0600) if err != nil { return fmt.Errorf("error while writing out-key: %s", err) } - b, err := nc.MarshalToPEM() + b, err = nc.MarshalToPEM() if err != nil { return fmt.Errorf("error while marshalling certificate: %s", err) }