From 9835714dbd2792590610fdf17630b6b8d6a1ad0a Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@sequoia-pgp.org>
Date: Fri, 22 Nov 2024 17:46:22 +0100
Subject: [PATCH] Improve sq key password's output.

  - When prompting to unlock a key, show the key's fingerprint, the
    key's creation time, and its key flags.  Don't show the
    certificate's fingerprint.  That's constant.

  - When we actually change a password, show a message, which can be
    silenced with `--quiet`.
---
 src/common/key/password.rs | 42 +++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/common/key/password.rs b/src/common/key/password.rs
index bb474d2d..0f061158 100644
--- a/src/common/key/password.rs
+++ b/src/common/key/password.rs
@@ -15,11 +15,12 @@ use openpgp::serialize::Serialize;
 use sequoia_keystore as keystore;
 use keystore::Protection;
 
-use crate::common;
+use crate::Convert;
 use crate::Sq;
 use crate::cli::types::FileOrStdout;
 use crate::cli::types::FileStdinOrKeyHandle;
 use crate::common::password;
+use crate::common;
 
 pub fn password<'a, P>(
     sq: Sq,
@@ -37,6 +38,8 @@ pub fn password<'a, P>(
 where
     P: 'a + KeyParts,
 {
+    make_qprintln!(sq.quiet);
+
     let mut new_password_ = None;
     // Some(password) => new password
     // None => clear password
@@ -56,6 +59,9 @@ where
 
     let uid = sq.best_userid(&cert, true);
 
+    qprintln!("Changed password for {}, {}",
+              cert.fingerprint(), uid);
+
     let ks = matches!(cert_source, FileStdinOrKeyHandle::KeyHandle(_));
     if ks {
         // Change the password of the secret key material on the key
@@ -80,10 +86,38 @@ where
                             wprintln!("{}", hint);
                         }
 
+                        let time = key.creation_time().convert().to_string();
+
+                        let flags = if let Some(flags) = key.key_flags() {
+                            let mut s = Vec::new();
+                            if flags.for_certification() {
+                                s.push("certifying");
+                            }
+                            if flags.for_signing() {
+                                s.push("signing");
+                            }
+                            if flags.for_storage_encryption()
+                                && flags.for_transport_encryption()
+                            {
+                                s.push("encryption");
+                            } else if flags.for_storage_encryption() {
+                                s.push("storage encryption");
+                            } else if flags.for_transport_encryption() {
+                                s.push("transport encryption");
+                            }
+                            if ! s.is_empty() {
+                                format!(" for {}", s.join(", "))
+                            } else {
+                                "".into()
+                            }
+                        } else {
+                            "".into()
+                        };
+
                         loop {
                             let p = password::prompt_to_unlock(&sq, &format!(
-                                "{}/{}, {}",
-                                cert.keyid(), key.keyid(), uid))?;
+                                "{}, created {}{}",
+                                key.fingerprint(), time, flags))?;
 
                             match remote_key.unlock(p.clone()) {
                                 Ok(()) => {
@@ -117,6 +151,8 @@ where
                     .with_context(|| {
                         format!("Changing {}'s password", key.fingerprint())
                     })?;
+
+                qprintln!("Changed password for {}", key.fingerprint());
             }
         }
     } else {