From 4133763b6268d5d2abce7b3419dbafb2c3d25a9b Mon Sep 17 00:00:00 2001 From: featherbutt <65744238+featherbutt@users.noreply.github.com> Date: Tue, 14 Jun 2022 05:42:50 -0700 Subject: [PATCH] pkg/sign: use local readKeyRing function instead of opengpg's, to handle armored key rings. (#1612) --- pkg/jsonsign/sign.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/jsonsign/sign.go b/pkg/jsonsign/sign.go index 674c1d53d..7d7bff0b7 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