laantungir/nak
1
0
Fork 0
mirror of https://github.com/fiatjaf/nak.git synced 2026-10-05 15:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from mattn/fix/dekey-corrupted-error-message

Browse Source 
gift, dekey: fix key-mismatch error wrapping a nil err with %w
This commit is contained in:
mattn
2026-07-15 09:27:42 +00:00
committed by GitHub
parent 3e50a8cba7 df2aaefb6d
commit b6fa2e4f64
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dekey.go
+1 -1
View File
@@ -164,7 +164,7 @@ var dekey = &cli.Command{
return fmt.Errorf("invalid main key: %w", err) return fmt.Errorf("invalid main key: %w", err)
} }
if eSec.Public() != ePub { if eSec.Public() != ePub {
return fmt.Errorf("stored decoupled encryption key is corrupted: %w", err) return fmt.Errorf("stored decoupled encryption key at %s doesn't match the announced key %s", eKeyPath, ePub.Hex())
} }
} else { } else {
log("- decoupled encryption key not found locally, attempting to fetch the key from other devices\n") log("- decoupled encryption key not found locally, attempting to fetch the key from other devices\n")
gift.go
+1 -1
View File
@@ -332,7 +332,7 @@ func getDecoupledEncryptionSecretKey(ctx context.Context, configPath string, pub
return [32]byte{}, true, fmt.Errorf("invalid main key: %w", err) return [32]byte{}, true, fmt.Errorf("invalid main key: %w", err)
} }
if eSec.Public() != ePub { if eSec.Public() != ePub {
return [32]byte{}, true, fmt.Errorf("stored decoupled encryption key is corrupted: %w", err) return [32]byte{}, true, fmt.Errorf("stored decoupled encryption key at %s doesn't match the announced key %s", eKeyPath, ePub.Hex())
} }
return eSec, true, nil return eSec, true, nil
} }