Parse OpenPGP key fingerprint information in Card

This removes duplication in OpenPGPCard and P15Card which both
provide OpenPGP keys.

GnuPG-bug-id: 4876

src/smartcard/card.cpp

@@ -265,6 +265,23 @@ bool Card::parseCardInfo(const std::string &name, const std::string &value)
             updateKeyInfo(info);
         }
         return true;
+    } else if (name == "KEY-FPR") {
+        // handle OpenPGP key fingerprints
+        const auto values = QString::fromStdString(value).split(QLatin1Char(' '));
+        if (values.size() < 2) {
+            qCWarning(KLEOPATRA_LOG) << "Invalid KEY-FPR status line" << QString::fromStdString(value);
+            setStatus(Card::CardError);
+        }
+        const auto keyNumber = values[0];
+        const std::string keyRef = "OPENPGP." + keyNumber.toStdString();
+        const auto fpr = values[1].toStdString();
+        if (keyNumber == QLatin1Char('1') || keyNumber == QLatin1Char('2') || keyNumber == QLatin1Char('3')) {
+            addCardInfo("KLEO-FPR-" + keyRef, fpr);
+        } else {
+            // Maybe more keyslots in the future?
+            qCDebug(KLEOPATRA_LOG) << "Unhandled keyslot" << keyNumber;
+        }
+        return true;
     } else {
         mCardInfo.insert({name, value});
     }

src/smartcard/openpgpcard.cpp

@@ -107,23 +107,6 @@ void OpenPGPCard::setCardInfo(const std::vector< std::pair<std::string, std::str
         if (parseCardInfo(pair.first, pair.second)) {
             continue;
         }
-        if (pair.first == "KEY-FPR") {
-            const auto values = QString::fromStdString(pair.second).split(QLatin1Char(' '));
-            if (values.size() < 2) {
-                qCWarning(KLEOPATRA_LOG) << "Invalid entry.";
-                setStatus(Card::CardError);
-                continue;
-            }
-            const auto keyNumber = values[0];
-            const std::string keyRef = "OPENPGP." + keyNumber.toStdString();
-            const auto fpr = values[1].toStdString();
-            if (keyNumber == QLatin1Char('1') || keyNumber == QLatin1Char('2') || keyNumber == QLatin1Char('3')) {
-                addCardInfo("KLEO-FPR-" + keyRef, fpr);
-            } else {
-                // Maybe more keyslots in the future?
-                qCDebug(KLEOPATRA_LOG) << "Unhandled keyslot";
-            }
-        }
     }
 }
 

src/smartcard/p15card.cpp

@@ -37,23 +37,6 @@ void P15Card::setCardInfo(const std::vector< std::pair<std::string, std::string>
         if (parseCardInfo(pair.first, pair.second)) {
             continue;
         }
-        if (pair.first == "KEY-FPR") {
-            const auto values = QString::fromStdString(pair.second).split(QLatin1Char(' '));
-            if (values.size() < 2) {
-                qCWarning(KLEOPATRA_LOG) << "Invalid entry.";
-                setStatus(Card::CardError);
-                continue;
-            }
-            const auto keyNumber = values[0];
-            const std::string keyRef = "OPENPGP." + keyNumber.toStdString();
-            const auto fpr = values[1].toStdString();
-            if (keyNumber == QLatin1Char('1') || keyNumber == QLatin1Char('2') || keyNumber == QLatin1Char('3')) {
-                addCardInfo("KLEO-FPR-" + keyRef, fpr);
-            } else {
-                // Maybe more keyslots in the future?
-                qCDebug(KLEOPATRA_LOG) << "Unhandled keyslot";
-            }
-        }
     }
 }