Coracle/nostrlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use encoding/hex in some places where xhex is more dangerous.

Browse Source
This commit is contained in:
fiatjaf
2026-01-10 09:55:15 -03:00
parent 24f89293d9
commit a5e52684e8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keys.go
View File

@@ -2,6 +2,7 @@ package nostr
import ( import (
"crypto/rand" "crypto/rand"
"encoding/hex"
stdjson "encoding/json" stdjson "encoding/json"
"fmt" "fmt"
"io" "io"
@@ -50,7 +51,7 @@ func (pk *SecretKey) UnmarshalJSON(buf []byte) error {
if len(buf) != 66 { if len(buf) != 66 {
return fmt.Errorf("must be a hex string of 64 characters") return fmt.Errorf("must be a hex string of 64 characters")
} }
if err := xhex.Decode(pk[:], buf[1:65]); err != nil { if _, err := hex.Decode(pk[:], buf[1:65]); err != nil {
return err return err
} }
return nil return nil
@@ -65,7 +66,7 @@ func SecretKeyFromHex(skh string) (SecretKey, error) {
return sk, fmt.Errorf("secret key should be at most 64-char hex, got '%s'", skh) return sk, fmt.Errorf("secret key should be at most 64-char hex, got '%s'", skh)
} }
if err := xhex.Decode(sk[:], unsafe.Slice(unsafe.StringData(skh), 64)); err != nil { if _, err := hex.Decode(sk[:], unsafe.Slice(unsafe.StringData(skh), 64)); err != nil {
return sk, fmt.Errorf("'%s' is not valid hex: %w", skh, err) return sk, fmt.Errorf("'%s' is not valid hex: %w", skh, err)
} }