Use openpgp.ReadKeyRing

Author: emersion

client.go

@@ -2,13 +2,11 @@ package wkd
 
 import (
 "fmt"
-"io"
 "net"
 "net/http"
 "strings"
 
 "golang.org/x/crypto/openpgp"
-"golang.org/x/crypto/openpgp/packet"
 )
 
 // Discover retrieves keys associated to an email address.
@@ -40,18 +38,5 @@ func Discover(addr string) ([]*openpgp.Entity, error) {
 }
 defer resp.Body.Close()
 
-r := packet.NewReader(resp.Body)
-var entities []*openpgp.Entity
-for {
-e, err := openpgp.ReadEntity(r)
-if err == io.EOF {
-break
-} else if err != nil {
-return entities, err
-}
-
-entities = append(entities, e)
-}
-
-return entities, nil
+return openpgp.ReadKeyRing(resp.Body)
 }