Forráskód Böngészése

cmd/nebula-cert: fix clobbered error (#1032)

* cmd/nebula-cert: fix clobbered error

Signed-off-by: Lars Lehtonen <[email protected]>

* apply suggestions from Nate

This makes it much clearer what is happening in the code

---------

Signed-off-by: Lars Lehtonen <[email protected]>
Co-authored-by: Wade Simmons <[email protected]>
Lars Lehtonen 1 éve
szülő
commit
3a8743d511
1 módosított fájl, 5 hozzáadás és 5 törlés
  1. 5 5
      cmd/nebula-cert/ca.go

+ 5 - 5
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)
 	}