From 5681beee514ae998c076d93bd1a36774e4fa4cfc Mon Sep 17 00:00:00 2001 From: Johan de Klerk <johan@shiplogic.com> Date: Mon, 24 Oct 2022 13:56:17 +0200 Subject: [PATCH] Return string on decrypt --- encryption/encryption.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/encryption/encryption.go b/encryption/encryption.go index 12eb442..909d48c 100644 --- a/encryption/encryption.go +++ b/encryption/encryption.go @@ -45,22 +45,23 @@ func Encrypt(plaintext string, key string) (string, error) { return string(gcm.Seal(nonce, nonce, []byte(plaintext), nil)), nil } -func Decrypt(ciphertext string, key string) ([]byte, error) { +func Decrypt(ciphertext string, key string) (string, error) { c, err := aes.NewCipher([]byte(key)) if err != nil { - return nil, err + return "", err } gcm, err := cipher.NewGCM(c) if err != nil { - return nil, err + return "", err } nonceSize := gcm.NonceSize() if len(ciphertext) < nonceSize { - return nil, errors.New("ciphertext too short") + return "", errors.New("ciphertext too short") } nonce, ciphertext := ciphertext[:nonceSize], ciphertext[nonceSize:] - return gcm.Open(nil, []byte(nonce), []byte(ciphertext), nil) + value, err := gcm.Open(nil, []byte(nonce), []byte(ciphertext), nil) + return string(value), err } -- GitLab