SSH Agent: Refactor encryption information

keepassxreboot · May 1, 2024 · 82b479b · 82b479b
1 parent cd9077e
commit 82b479b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
@@ -2540,10 +2540,6 @@ Disable safe saves and try again?</source>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>(encrypted)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Select private key</source>
         <translation type="unfinished"></translation>
@@ -2653,10 +2649,6 @@ Would you like to correct it?</source>
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>(comment is encrypted)</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -6192,6 +6184,10 @@ We recommend you use the AppImage available on our downloads page.</source>
         <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenSSHKeyGenDialog</name>

diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
@@ -661,23 +661,19 @@ void EditEntryWidget::updateSSHAgentKeyInfo()
     if (!key.fingerprint().isEmpty()) {
         m_sshAgentUi->fingerprintTextLabel->setText(key.fingerprint(QCryptographicHash::Md5) + "\n"
                                                     + key.fingerprint(QCryptographicHash::Sha256));
-    } else {
-        m_sshAgentUi->fingerprintTextLabel->setText(tr("(encrypted)"));
     }
 
     if (!key.comment().isEmpty()) {
         m_sshAgentUi->commentTextLabel->setText(key.comment());
-    } else if (key.encrypted()) {
-        m_sshAgentUi->commentTextLabel->setText(tr("(encrypted)"));
+    }
+
+    if (key.encrypted()) {
         m_sshAgentUi->decryptButton->setEnabled(true);
     }
 
-    if (!key.publicKey().isEmpty() && !key.encrypted()) {
+    if (!key.publicKey().isEmpty()) {
         m_sshAgentUi->publicKeyEdit->document()->setPlainText(key.publicKey());
         m_sshAgentUi->copyToClipboardButton->setEnabled(true);
-    } else {
-        m_sshAgentUi->publicKeyEdit->document()->setPlainText(key.publicKey() + tr("(comment is encrypted)"));
-        m_sshAgentUi->copyToClipboardButton->setDisabled(true);
     }
 
     // enable agent buttons only if we have an agent running

diff --git a/src/sshagent/KeeAgentSettings.cpp b/src/sshagent/KeeAgentSettings.cpp
@@ -489,11 +489,11 @@ bool KeeAgentSettings::toOpenSSHKey(const QString& username,
         }
     }
 
-    if (key.comment().isEmpty() && !key.encrypted()) {
+    if (key.comment().isEmpty()) {
         key.setComment(username);
     }
 
-    if (key.comment().isEmpty() && !key.encrypted()) {
+    if (key.comment().isEmpty()) {
         key.setComment(fileName);
     }
 

diff --git a/src/sshagent/OpenSSHKey.cpp b/src/sshagent/OpenSSHKey.cpp
@@ -84,7 +84,7 @@ const QString OpenSSHKey::type() const
 const QString OpenSSHKey::fingerprint(QCryptographicHash::Algorithm algo) const
 {
     if (m_rawPublicData.isEmpty()) {
-        return {};
+        return {tr("(encrypted)")};
     }
 
     QByteArray publicKey;
@@ -351,6 +351,8 @@ bool OpenSSHKey::parsePKCS1PEM(const QByteArray& in)
     // load private if no encryption
     if (!encrypted()) {
         return openKey();
+    } else {
+        m_comment = tr("(encrypted)");
     }
 
     return true;