lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change error message pmapi -> pm-crypto

Browse source
This commit is contained in:
Jakub 2019-03-07 17:03:16 +01:00
parent 36b497d591
commit 968888eb0e
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crypto/key.go
View file

@ -50,7 +50,7 @@ func (sk *SymmetricKey) GetCipherFunc() packet.CipherFunction {
return cf return cf
} }
panic("pmapi: unsupported cipher function: " + sk.Algo) panic("pm-crypto: unsupported cipher function: " + sk.Algo)
} }
// GetBase64Key returns a key as base64 encoded string // GetBase64Key returns a key as base64 encoded string
@ -68,7 +68,7 @@ func newSymmetricKey(ek *packet.EncryptedKey) *SymmetricKey {
} }
} }
if algo == "" { if algo == "" {
panic(fmt.Sprintf("pmapi: unsupported cipher function: %v", ek.CipherFunc)) panic(fmt.Sprintf("pm-crypto: unsupported cipher function: %v", ek.CipherFunc))
} }
return &SymmetricKey{ return &SymmetricKey{
@ -103,7 +103,7 @@ func DecryptAttKey(kr *KeyRing, keyPacket string) (key *SymmetricKey, err error)
} }
if decryptErr != nil { if decryptErr != nil {
err = fmt.Errorf("pmapi: cannot decrypt encrypted key packet: %v", decryptErr) err = fmt.Errorf("pm-crypto: cannot decrypt encrypted key packet: %v", decryptErr)
return return
} }
@ -202,15 +202,15 @@ func SeparateKeyAndData(kr *KeyRing, r io.Reader, estimatedLength int, garbageCo
} }
} }
if decryptErr != nil { if decryptErr != nil {
err = fmt.Errorf("pmapi: cannot decrypt encrypted key packet: %v", decryptErr) err = fmt.Errorf("pm-crypto: cannot decrypt encrypted key packet: %v", decryptErr)
return return
} }
if ek == nil { if ek == nil {
err = errors.New("pmapi: packets don't include an encrypted key packet") err = errors.New("pm-crypto: packets don't include an encrypted key packet")
return return
} }
/*if ek.Key == nil { /*if ek.Key == nil {
err = errors.New("pmapi: could not find any key to decrypt key") err = errors.New("pm-crypto: could not find any key to decrypt key")
return return
}*/ }*/
@ -255,12 +255,12 @@ func SetKey(kr *KeyRing, symKey *SymmetricKey) (packets string, err error) {
//k, err := base64.StdEncoding.DecodeString(symKey.Key) //k, err := base64.StdEncoding.DecodeString(symKey.Key)
//if err != nil { //if err != nil {
// err = fmt.Errorf("pmapi: cannot set key: %v", err) // err = fmt.Errorf("pm-crypto: cannot set key: %v", err)
// return // return
//} //}
if len(kr.entities) == 0 { if len(kr.entities) == 0 {
err = fmt.Errorf("pmapi: cannot set key: key ring is empty") err = fmt.Errorf("pm-crypto: cannot set key: key ring is empty")
return return
} }
@ -286,17 +286,17 @@ func SetKey(kr *KeyRing, symKey *SymmetricKey) (packets string, err error) {
} }
} }
if pub == nil { if pub == nil {
err = fmt.Errorf("pmapi: cannot set key: no public key available") err = fmt.Errorf("pm-crypto: cannot set key: no public key available")
return return
} }
if err = packet.SerializeEncryptedKey(w, pub, cf, symKey.Key, nil); err != nil { if err = packet.SerializeEncryptedKey(w, pub, cf, symKey.Key, nil); err != nil {
err = fmt.Errorf("pmapi: cannot set key: %v", err) err = fmt.Errorf("pm-crypto: cannot set key: %v", err)
return return
} }
if err = w.Close(); err != nil { if err = w.Close(); err != nil {
err = fmt.Errorf("pmapi: cannot set key: %v", err) err = fmt.Errorf("pm-crypto: cannot set key: %v", err)
return return
} }

6
crypto/keyring.go
View file

@ -59,7 +59,7 @@ type SignedString struct {
Signed *Signature Signed *Signature
} }
var errKeyringNotUnlocked = errors.New("pmapi: cannot sign message, key ring is not unlocked") var errKeyringNotUnlocked = errors.New("pm-crypto: cannot sign message, key ring is not unlocked")
// Err returns a non-nil error if the signature is invalid. // Err returns a non-nil error if the signature is invalid.
// Use: not used by bridge // Use: not used by bridge
@ -451,7 +451,7 @@ func (kr *KeyRing) DecryptArmored(r io.Reader) (decrypted io.Reader, signed *Sig
} }
if block.Type != constants.PGPMessageHeader { if block.Type != constants.PGPMessageHeader {
err = errors.New("pmapi: not an armored PGP message") err = errors.New("pm-crypto: not an armored PGP message")
return return
} }
@ -524,7 +524,7 @@ func (kr *KeyRing) readFrom(r io.Reader, armored bool) error {
} }
if len(entities) == 0 { if len(entities) == 0 {
return errors.New("pmapi: key ring doesn't contain any key") return errors.New("pm-crypto: key ring doesn't contain any key")
} }
kr.entities = append(kr.entities, entities...) kr.entities = append(kr.entities, entities...)

2
crypto/session.go
View file

@ -124,7 +124,7 @@ func (pm *PmCrypto) KeyPacketWithPublicKeyBin(sessionSplit *SymmetricKey, public
} }
if err = packet.SerializeEncryptedKey(outbuf, pub, cf, sessionSplit.Key, nil); err != nil { if err = packet.SerializeEncryptedKey(outbuf, pub, cf, sessionSplit.Key, nil); err != nil {
err = fmt.Errorf("pmapi: cannot set key: %v", err) err = fmt.Errorf("pm-crypto: cannot set key: %v", err)
return nil, errors.New("cannot set key: key ring is empty") return nil, errors.New("cannot set key: key ring is empty")
} }
return outbuf.Bytes(), nil return outbuf.Bytes(), nil