From a3fcec4a4cf0c9ef921d94ef11405dbbac4c6bf5 Mon Sep 17 00:00:00 2001 From: Pancakes Date: Tue, 10 Sep 2024 21:39:07 -0400 Subject: [PATCH] Don't use Sprintf in Errorf for no reason --- api/account/changepw.go | 2 +- api/account/register.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/account/changepw.go b/api/account/changepw.go index 2e79971..a7212d2 100644 --- a/api/account/changepw.go +++ b/api/account/changepw.go @@ -32,7 +32,7 @@ func ChangePW(uuid []byte, password string) error { salt := make([]byte, ArgonSaltSize) _, err := rand.Read(salt) if err != nil { - return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err)) + return fmt.Errorf("failed to generate salt: %s", err) } err = db.UpdateAccountPassword(uuid, deriveArgon2IDKey([]byte(password), salt), salt) diff --git a/api/account/register.go b/api/account/register.go index f2ed611..9781271 100644 --- a/api/account/register.go +++ b/api/account/register.go @@ -20,6 +20,7 @@ package account import ( "crypto/rand" "fmt" + "github.com/pagefaultgames/rogueserver/db" ) @@ -42,7 +43,7 @@ func Register(username, password string) error { salt := make([]byte, ArgonSaltSize) _, err = rand.Read(salt) if err != nil { - return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err)) + return fmt.Errorf("failed to generate salt: %s", err) } err = db.AddAccountRecord(uuid, username, deriveArgon2IDKey([]byte(password), salt), salt)