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

Android stable version

Browse source
This commit is contained in:
Jakub Lehotsky 2018-11-09 02:03:19 +01:00
parent 36f8e2d437
commit 3fe6899fbb
5 changed files with 91 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crypto/keyring.go
View file

@ -473,6 +473,37 @@ func (kr *KeyRing) readFrom(r io.Reader, armored bool) error {
return nil
}
/*func (kr *KeyRing) AppendStringKey(key string) error {
sr := strings.NewReader(key)
return kr.readFrom(sr, true)
}*/
func (pm *PmCrypto) BuildKeyRing(binKeys []byte) (kr *KeyRing, err error) {
kr = &KeyRing{}
entriesReader := bytes.NewReader(binKeys)
err = kr.readFrom(entriesReader, false)
return
}
func (pm *PmCrypto) BuildKeyRingNoEror(binKeys []byte) (kr *KeyRing) {
kr = &KeyRing{}
entriesReader := bytes.NewReader(binKeys)
kr.readFrom(entriesReader, false)
return
}
func (pm *PmCrypto) BuildKeyRingArmored(key string) (kr *KeyRing, err error) {
keyRaw, err := armorUtils.Unarmor(key)
keyReader := bytes.NewReader(keyRaw)
keyEntries, err := openpgp.ReadKeyRing(keyReader)
return &KeyRing{entities: keyEntries}, err
}
// UnmarshalJSON implements encoding/json.Unmarshaler.
func (kr *KeyRing) UnmarshalJSON(b []byte) (err error) {
kr.entities = nil