openpgp: Change TPK::primary to return the key and not the binding

  - The primary key is not a binding; it is a single component.
    Thus, returning a ComponentBinding is misleading.

  - Add methods to the TPK structure to return the direct signatures,
    certifications, self revocations, and other revocations.

1 files changed, 2 insertions, 2 deletions

diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index 6a1246af..4a97134b 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -518,7 +518,7 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> {
                     v.tpks = v.helper.get_public_keys(&issuers)?;
 
                     for (i, tpk) in v.tpks.iter().enumerate() {
-                        if can_sign(tpk.primary().key(),
+                        if can_sign(tpk.primary(),
                                     tpk.primary_key_signature(None), t) {
                             v.keys.insert(tpk.keyid(), (i, 0));
                         }
@@ -1305,7 +1305,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> {
                             }
                         };
 
-                        if can_sign(tpk.primary().key().into(),
+                        if can_sign(tpk.primary().into(),
                                     tpk.primary_key_signature(None)) {
                             v.keys.insert(tpk.keyid(), (i, 0));
                         }