From 0eb0dd6ee14130897e28d061fdefcc928bfc781f Mon Sep 17 00:00:00 2001 From: nbari Date: Fri, 7 Oct 2016 11:26:41 +0200 Subject: [PATCH] fixed bug on cache (returning key instead of uKey) --- cache.go | 2 +- cmd/ssh-vault/main.go | 4 ++-- vault.go | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cache.go b/cache.go index 5bd9f00..1ef4b13 100644 --- a/cache.go +++ b/cache.go @@ -35,7 +35,7 @@ func (c *cache) Get(u string) (string, error) { if err != nil { log.Println(err) } - return key, nil + return uKey, nil } return uKey, nil } diff --git a/cmd/ssh-vault/main.go b/cmd/ssh-vault/main.go index 3fe61e7..de206ce 100644 --- a/cmd/ssh-vault/main.go +++ b/cmd/ssh-vault/main.go @@ -32,8 +32,8 @@ func main() { os.Args[0], " Options:", " create creates a new vault", - " edit open an existing vault", - " view open an existing vault") + " edit edit an existing vault", + " view view an existing vault") flag.PrintDefaults() } diff --git a/vault.go b/vault.go index dd2d2ff..1d14ca5 100644 --- a/vault.go +++ b/vault.go @@ -9,7 +9,6 @@ import ( "encoding/base64" "encoding/pem" "fmt" - "os" "os/exec" "strings" ) @@ -48,9 +47,6 @@ func New(k, u, o, v string) (*vault, error) { // PKCS8 convert ssh public key to PEM PKCS8 func (v *vault) PKCS8() error { - if _, err := os.Stat(v.key); os.IsNotExist(err) { - fmt.Printf("err = %+v\n", err) - } out, err := exec.Command("ssh-keygen", "-f", v.key,