Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-20 09:06:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: prefer empty string check vs nil check

Browse Source
This commit is contained in:
James Houlahan
2021-06-25 15:33:56 +02:00
parent 7ab54da8c4
commit 2707a5627c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/pmapi/keyring.go
View File

@ -36,8 +36,8 @@ type PMKey struct {
Fingerprint string Fingerprint string
PrivateKey *crypto.Key PrivateKey *crypto.Key
Primary int Primary int
Token *string `json:",omitempty"` Token string
Signature *string `json:",omitempty"` Signature string
} }
type clearable []byte type clearable []byte
@ -84,12 +84,12 @@ func (key PMKey) getPassphraseFromToken(kr *crypto.KeyRing) (passphrase []byte,
return nil, errors.New("no user key was provided") return nil, errors.New("no user key was provided")
} }
msg, err := crypto.NewPGPMessageFromArmored(*key.Token) msg, err := crypto.NewPGPMessageFromArmored(key.Token)
if err != nil { if err != nil {
return return
} }
sig, err := crypto.NewPGPSignatureFromArmored(*key.Signature) sig, err := crypto.NewPGPSignatureFromArmored(key.Signature)
if err != nil { if err != nil {
return return
} }
@ -137,7 +137,7 @@ func (keys *PMKeys) UnlockAll(passphrase []byte, userKey *crypto.KeyRing) (kr *c
for _, key := range *keys { for _, key := range *keys {
var secret []byte var secret []byte
if key.Token == nil || key.Signature == nil { if key.Token == "" || key.Signature == "" {
secret = passphrase secret = passphrase
} else if secret, err = key.getPassphraseFromToken(userKey); err != nil { } else if secret, err = key.getPassphraseFromToken(userKey); err != nil {
return return