pkg/sign: use local readKeyRing function instead of opengpg's, to handle armored

[nor...@perkeep.org]

https://github.com/perkeep/perkeep/commit/4133763b6268d5d2abce7b3419dbafb2c3d25a9b

commit 4133763b6268d5d2abce7b3419dbafb2c3d25a9b
Author: featherbutt <65744238+f...@users.noreply.github.com>
Date: Tue Jun 14 05:42:50 2022 -0700

pkg/sign: use local readKeyRing function instead of opengpg's, to handle armored key rings. (#1612)

diff --git a/pkg/jsonsign/sign.go b/pkg/jsonsign/sign.go
index 674c1d5..7d7bff0 100644
--- a/pkg/jsonsign/sign.go
+++ b/pkg/jsonsign/sign.go
@@ -84,9 +84,9 @@ func (fe *FileEntityFetcher) FetchEntity(fingerprint string) (*openpgp.Entity, e
return nil, fmt.Errorf("jsonsign: FetchEntity: %v", err)
}
defer f.Close()
- el, err := openpgp.ReadKeyRing(f)
+ el, err := readKeyRing(f)
if err != nil {
- return nil, fmt.Errorf("jsonsign: openpgp.ReadKeyRing of %q: %v", fe.File, err)
+ return nil, fmt.Errorf("jsonsign: readKeyRing of %q: %v", fe.File, err)
}
for _, e := range el {
pubk := &e.PrivateKey.PublicKey