openpgp: Rename SecretKey to SecretKeyMaterial.

  - When the `SecretKey` type only refers to the secret key material
    and not a TPK-like thing, call it `SecretKeyMaterial`.

1 files changed, 2 insertions, 2 deletions

diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs
index b1ec3ee5..748f9c7a 100644
--- a/tool/src/commands/decrypt.rs
+++ b/tool/src/commands/decrypt.rs
@@ -10,7 +10,7 @@ use crate::openpgp::constants::SymmetricAlgorithm;
 use crate::openpgp::conversions::hex;
 use crate::openpgp::crypto::SessionKey;
 use crate::openpgp::{Fingerprint, TPK, KeyID, Result};
-use crate::openpgp::packet::{Key, key::SecretKey, Signature, PKESK, SKESK};
+use crate::openpgp::packet::{Key, key::SecretKeyMaterial, Signature, PKESK, SKESK};
 use crate::openpgp::parse::PacketParser;
 use crate::openpgp::parse::stream::{
     VerificationHelper, DecryptionHelper, Decryptor, MessageStructure,
@@ -122,7 +122,7 @@ impl<'a> DecryptionHelper for Helper<'a> {
         for pkesk in pkesks {
             let keyid = pkesk.recipient();
             if let Some(key) = self.secret_keys.get(&keyid) {
-                if let Some(SecretKey::Unencrypted { .. }) = key.secret() {
+                if let Some(SecretKeyMaterial::Unencrypted { .. }) = key.secret() {
                     if let Ok(sk) = key.clone().into_keypair()
                         .and_then(|mut keypair| pkesk.decrypt(&mut keypair))
                         .and_then(|(algo, sk)| { decrypt(algo, &sk)?; Ok(sk) })