From 4e03758e92887fe4251a73ce8125b93e8624b6a2 Mon Sep 17 00:00:00 2001 From: Ryan Mehri Date: Fri, 15 May 2020 19:00:21 -0600 Subject: Add comments and clean up encryption --- backend/db/db.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'backend/db') diff --git a/backend/db/db.go b/backend/db/db.go index b18eddf..df112d0 100644 --- a/backend/db/db.go +++ b/backend/db/db.go @@ -48,18 +48,18 @@ func New(ip, content, expiry, title, password string) (string, error) { // if there is a password, encrypt content and hash the password if password != "" { // use pass to encrypt content - key, salt, err := security.DeriveKey([]byte(password), nil) + key, salt, err := security.DeriveKey(password, nil) if err != nil { return "", fmt.Errorf("could not generate key: %s", err.Error()) } new.Salt = salt - encryptedBytes, err := security.Encrypt(key, []byte(new.Content)) + encryptedContent, err := security.Encrypt(key, new.Content) if err != nil { return "", fmt.Errorf("could not encrypt content: %s", err.Error()) } - new.Content = string(encryptedBytes) + new.Content = encryptedContent // hash given password hashedPass, err := security.HashPassword(password) -- cgit v1.2.3