openpgp: Remove redundant use of Key::mark_role_primary_ref.

5 files changed, 10 insertions, 10 deletions

diff --git a/openpgp/src/cert/bindings.rs b/openpgp/src/cert/bindings.rs
index 688e850b..2dd3aac4 100644
--- a/openpgp/src/cert/bindings.rs
+++ b/openpgp/src/cert/bindings.rs
@@ -65,7 +65,7 @@ impl<P: key::KeyParts> Key<P, key::SubordinateRole> {
             .set_issuer_fingerprint(signer.public().fingerprint())?
             .set_issuer(signer.public().keyid())?
             .sign_subkey_binding(
-                signer, cert.primary_key().key().mark_role_primary_ref(), self)
+                signer, cert.primary_key().key(), self)
     }
 }
 
@@ -117,7 +117,7 @@ impl UserID {
             .set_issuer_fingerprint(signer.public().fingerprint())?
             .set_issuer(signer.public().keyid())?
             .sign_userid_binding(
-                signer, cert.primary_key().key().mark_role_primary_ref(), self)
+                signer, cert.primary_key().key(), self)
     }
 
     /// Returns a certificate for the user id.
@@ -255,7 +255,7 @@ impl UserAttribute {
             .set_issuer_fingerprint(signer.public().fingerprint())?
             .set_issuer(signer.public().keyid())?
             .sign_user_attribute_binding(
-                signer, cert.primary_key().key().mark_role_primary_ref(), self)
+                signer, cert.primary_key().key(), self)
     }
 
     /// Returns a certificate for the user attribute.
diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs
index b208b0cd..61d358f2 100644
--- a/openpgp/src/cert/mod.rs
+++ b/openpgp/src/cert/mod.rs
@@ -2889,8 +2889,8 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g=
 
             // Make sure the certification is correct.
             alice_certifies_bob
-                .verify_userid_binding(alice.primary_key().key().mark_role_primary_ref(),
-                                       bob.primary_key().key().mark_role_primary_ref(),
+                .verify_userid_binding(alice.primary_key().key(),
+                                       bob.primary_key().key(),
                                        bob_userid_binding.userid()).unwrap();
         }
    }
diff --git a/openpgp/src/crypto/hash.rs b/openpgp/src/crypto/hash.rs
index 0afd1d33..12fc49d0 100644
--- a/openpgp/src/crypto/hash.rs
+++ b/openpgp/src/crypto/hash.rs
@@ -495,7 +495,7 @@ mod test {
                 for selfsig in binding.self_signatures() {
                     let h = Signature::hash_userid_binding(
                         selfsig,
-                        cert.primary_key().key().mark_role_primary_ref(),
+                        cert.primary_key().key(),
                         binding.userid()).unwrap();
                     if &h[..2] != selfsig.digest_prefix() {
                         eprintln!("{:?}: {:?} / {:?}",
@@ -512,7 +512,7 @@ mod test {
                 for selfsig in binding.self_signatures() {
                     let h = Signature::hash_user_attribute_binding(
                         selfsig,
-                        cert.primary_key().key().mark_role_primary_ref(),
+                        cert.primary_key().key(),
                         binding.user_attribute()).unwrap();
                     if &h[..2] != selfsig.digest_prefix() {
                         eprintln!("{:?}: {:?} / {:?}",
@@ -528,7 +528,7 @@ mod test {
                 for selfsig in binding.self_signatures() {
                     let h = Signature::hash_subkey_binding(
                         selfsig,
-                        cert.primary_key().key().mark_role_primary_ref(),
+                        cert.primary_key().key(),
                         binding.key()).unwrap();
                     if &h[..2] != selfsig.digest_prefix() {
                         eprintln!("{:?}: {:?}", i, binding);
diff --git a/openpgp/src/packet/key/mod.rs b/openpgp/src/packet/key/mod.rs
index 9f37507c..4bd757de 100644
--- a/openpgp/src/packet/key/mod.rs
+++ b/openpgp/src/packet/key/mod.rs
@@ -46,7 +46,7 @@
 //! let sk: &Key<key::SecretParts, key::PrimaryRole> = cert.primary_key().key().try_into()?;
 //!
 //! // Make the conversion explicit.
-//! let sk = cert.primary_key().key().mark_parts_secret_ref()?.mark_role_primary_ref();
+//! let sk = cert.primary_key().key().mark_parts_secret_ref()?;
 //! #     Ok(())
 //! # }
 //! ```
diff --git a/openpgp/src/packet/signature/mod.rs b/openpgp/src/packet/signature/mod.rs
index 3ed80f38..8d6c9881 100644
--- a/openpgp/src/packet/signature/mod.rs
+++ b/openpgp/src/packet/signature/mod.rs
@@ -1389,7 +1389,7 @@ mod test {
         let cert = &uid_binding.certifications()[0];
 
         cert.verify_userid_binding(cert_key1,
-                                   test2.primary_key().key().mark_role_primary_ref(),
+                                   test2.primary_key().key(),
                                    uid_binding.userid()).unwrap();
     }