From fd28d45f109b7ad8d0f2dc9889f3097a830b483e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Jul 2020 23:30:28 +0100
Subject: [PATCH] make golangci-lint happy

---
 pkgs/sops-pgp-hook/hook_test.go |  8 ++++----
 pkgs/ssh-to-pgp/main.go         |  5 ++++-
 pkgs/sshkeys/convert.go         | 21 ---------------------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/pkgs/sops-pgp-hook/hook_test.go b/pkgs/sops-pgp-hook/hook_test.go
index 6d4f8f2..c3af301 100644
--- a/pkgs/sops-pgp-hook/hook_test.go
+++ b/pkgs/sops-pgp-hook/hook_test.go
@@ -36,18 +36,18 @@ func TestShellHook(t *testing.T) {
 	cmd.Stderr = &stderrBuf
 	cmd.Dir = assets
 	err = cmd.Run()
-	stdout := string(stdoutBuf.Bytes())
-	stderr := string(stderrBuf.Bytes())
+	stdout := stdoutBuf.String()
+	stderr := stderrBuf.String()
 	fmt.Printf("$ %s\nstdout: \n%s\nstderr: \n%s\n", strings.Join(cmd.Args, " "), stdout, stderr)
 	ok(t, err)
 
 	expectedStdout := "SOPS_PGP_FP=C6DA56E69A7C756564A8AFEB4A6B05B714D13EFD,4EC40F8E04A945339F7F7C0032C5225271038E3F,7FB89715AADA920D65D25E63F9BA9DEBD03F57C0"
-	if strings.Index(stdout, expectedStdout) == -1 {
+	if !strings.Contains(stdout, expectedStdout) {
 		t.Fatalf("'%v' not in '%v'", expectedStdout, stdout)
 	}
 
 	expectedStderr := "./non-existing-key.gpg does not exists"
-	if strings.Index(stderr, expectedStderr) == -1 {
+	if !strings.Contains(stderr, expectedStderr) {
 		t.Fatalf("'%v' not in '%v'", expectedStderr, stdout)
 	}
 
diff --git a/pkgs/ssh-to-pgp/main.go b/pkgs/ssh-to-pgp/main.go
index 4cb269c..b9f1a2b 100644
--- a/pkgs/ssh-to-pgp/main.go
+++ b/pkgs/ssh-to-pgp/main.go
@@ -25,7 +25,10 @@ func parseFlags(args []string) options {
 	f.StringVar(&opts.format, "format", "armor", "GPG format encoding (binary|armor)")
 	f.StringVar(&opts.in, "i", "-", "Input path. Reads by default from standard output")
 	f.StringVar(&opts.out, "o", "-", "Output path. Prints by default to standard output")
-	f.Parse(args[1:])
+	if err := f.Parse(args[1:]); err != nil {
+		// should never happen since flag.ExitOnError
+		panic(err)
+	}
 
 	return opts
 }
diff --git a/pkgs/sshkeys/convert.go b/pkgs/sshkeys/convert.go
index cccb686..a591809 100644
--- a/pkgs/sshkeys/convert.go
+++ b/pkgs/sshkeys/convert.go
@@ -12,27 +12,6 @@ import (
 	"golang.org/x/crypto/ssh"
 )
 
-func parsePublicKey(publicKey []byte) (*rsa.PublicKey, error) {
-	key, _, _, _, err := ssh.ParseAuthorizedKey(publicKey)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse public ssh key: %s", err)
-	}
-
-	cryptoPublicKey, ok := key.(ssh.CryptoPublicKey)
-
-	if !ok {
-		return nil, fmt.Errorf("Unsupported public key algo: %s", key.Type())
-	}
-
-	rsaKey, ok := cryptoPublicKey.CryptoPublicKey().(*rsa.PublicKey)
-
-	if !ok {
-		return nil, fmt.Errorf("Unsupported public key algo: %s", key.Type())
-	}
-
-	return rsaKey, nil
-}
-
 func parsePrivateKey(sshPrivateKey []byte) (*rsa.PrivateKey, error) {
 	privateKey, err := ssh.ParseRawPrivateKey(sshPrivateKey)
 	if err != nil {