Thanks to visit codestin.com
Credit goes to github.com

Skip to content

jsonsign: write armored keyring #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2022
Merged

jsonsign: write armored keyring #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/jsonsign/jsonsign_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func TestWriteKeyRing(t *testing.T) {
t.Fatalf("WriteKeyRing: %v", err)
}

el, err := openpgp.ReadKeyRing(&buf)
el, err := openpgp.ReadArmoredKeyRing(&buf)
if err != nil {
t.Fatalf("ReadKeyRing: %v", err)
}
Expand Down
23 changes: 18 additions & 5 deletions pkg/jsonsign/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ func EntityFromSecring(keyID, keyFile string) (*openpgp.Entity, error) {
}
defer secring.Close()

el, err := openpgp.ReadKeyRing(secring)
el, err := readKeyRing(secring)
if err != nil {
return nil, fmt.Errorf("openpgp.ReadKeyRing of %q: %v", keyFile, err)
return nil, fmt.Errorf("readKeyRing of %q: %v", keyFile, err)
}
var entity *openpgp.Entity
for _, e := range el {
Expand Down Expand Up @@ -150,12 +150,25 @@ func NewEntity() (*openpgp.Entity, error) {
}

func WriteKeyRing(w io.Writer, el openpgp.EntityList) error {
armoredWriter, err := armor.Encode(w, openpgp.PrivateKeyType, nil)
if err != nil {
return err
}
for _, ent := range el {
if err := ent.SerializePrivate(w, nil); err != nil {
if err := ent.SerializePrivate(armoredWriter, nil); err != nil {
return err
}
}
return nil
return armoredWriter.Close()
}

// readKeyRing reads a keyring, armored or not.
func readKeyRing(r io.Reader) (openpgp.EntityList, error) {
var buffer bytes.Buffer
if el, err := openpgp.ReadArmoredKeyRing(io.TeeReader(r, &buffer)); err == nil {
return el, err
}
return openpgp.ReadKeyRing(&buffer)
}

// KeyIdFromRing returns the public keyID contained in the secret
Expand All @@ -167,7 +180,7 @@ func KeyIdFromRing(secRing string) (keyID string, err error) {
return "", fmt.Errorf("Could not open secret ring file %v: %v", secRing, err)
}
defer f.Close()
el, err := openpgp.ReadKeyRing(f)
el, err := readKeyRing(f)
if err != nil {
return "", fmt.Errorf("Could not read secret ring file %s: %v", secRing, err)
}
Expand Down