lockbox

commit 8b13c06d399998b949578dc4d09d8e3decacba3e
parent 059e23465573c662dfeb08c6e3246efdb7049fa2
Author: Sean Enck <sean@ttypty.com>
Date:   Wed, 26 Jul 2023 18:57:47 -0400

merge functions

Diffstat:
M
internal/inputs/vars.go
 | 
23
++++++++---------------

1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/internal/inputs/vars.go b/internal/inputs/vars.go
@@ -136,21 +136,10 @@ func GetKey() ([]byte, error) {
 	if useKey == "" {
 		return nil, errors.New("no key given")
 	}
-	b, err := getKey(useKeyMode, useKey)
-	if err != nil {
-		return nil, err
-	}
-	if len(b) == 0 {
-		return nil, errors.New("key is empty")
-	}
-	return b, nil
-}
-
-func getKey(keyMode, name string) ([]byte, error) {
 	var data []byte
-	switch keyMode {
+	switch useKeyMode {
 	case commandKeyMode:
-		parts, err := Shlex(name)
+		parts, err := Shlex(useKey)
 		if err != nil {
 			return nil, err
 		}
@@ -161,11 +150,15 @@ func getKey(keyMode, name string) ([]byte, error) {
 		}
 		data = b
 	case plainKeyMode:
-		data = []byte(name)
+		data = []byte(useKey)
 	default:
 		return nil, errors.New("unknown keymode")
 	}
-	return []byte(strings.TrimSpace(string(data))), nil
+	b := []byte(strings.TrimSpace(string(data)))
+	if len(b) == 0 {
+		return nil, errors.New("key is empty")
+	}
+	return b, nil
 }
 
 // TOTPToken gets the name of the totp special case tokens