From 947b6ba8e8b7fb298ce29162b6e4878a00b36819 Mon Sep 17 00:00:00 2001 From: Morten Linderud Date: Sun, 5 Sep 2021 14:42:31 +0200 Subject: [PATCH] Formating: Added some misc formatting Signed-off-by: Morten Linderud --- cmd/sbctl/main.go | 2 +- cmd/sbctl/sign-all.go | 2 +- keys.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/sbctl/main.go b/cmd/sbctl/main.go index 42dc421..6a122e7 100644 --- a/cmd/sbctl/main.go +++ b/cmd/sbctl/main.go @@ -70,7 +70,7 @@ func main() { if strings.HasPrefix(err.Error(), "unknown comman") { logging.Println(err.Error()) } else if errors.Is(err, os.ErrPermission) { - logging.Error(fmt.Errorf("sbtl requires root to run: %w", err)) + logging.Error(fmt.Errorf("sbctl requires root to run: %w", err)) } else if errors.Is(err, sbctl.ErrImmutable) { logging.Println("You need to chattr -i files in efivarfs") } else if !errors.Is(err, ErrSilent) { diff --git a/cmd/sbctl/sign-all.go b/cmd/sbctl/sign-all.go index 1515255..bc2a6fe 100644 --- a/cmd/sbctl/sign-all.go +++ b/cmd/sbctl/sign-all.go @@ -33,7 +33,7 @@ var signAllCmd = &cobra.Command{ if errors.Is(err, sbctl.ErrAlreadySigned) { logging.Print("File have already been signed %s\n", entry.OutputFile) } else if err != nil { - return err + return fmt.Errorf("failed signing %s: %w", entry.File, err) } else { logging.Ok("Signed %s", entry.OutputFile) } diff --git a/keys.go b/keys.go index 5221c9a..42e930b 100644 --- a/keys.go +++ b/keys.go @@ -148,7 +148,7 @@ func VerifyFile(cert, file string) (bool, error) { } sigs, err := pecoff.GetSignatures(peFile) if err != nil { - return false, err + return false, fmt.Errorf("%s: %w", file, err) } if len(sigs) == 0 { return false, nil