diff --git a/src/commands/keytocardcommand.cpp b/src/commands/keytocardcommand.cpp
index 09b94b2ee..0fce33f1d 100644
--- a/src/commands/keytocardcommand.cpp
+++ b/src/commands/keytocardcommand.cpp
@@ -1,559 +1,615 @@
 /* commands/setinitialpincommand.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2017 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include <config-kleopatra.h>
 
 #include "keytocardcommand.h"
 #include "kleopatra_debug.h"
 
 #include "command_p.h"
 
 #include "smartcard/readerstatus.h"
 #include "smartcard/openpgpcard.h"
 #include "smartcard/pivcard.h"
 
 #include "commands/authenticatepivcardapplicationcommand.h"
 
 #include "utils/writecertassuantransaction.h"
 
+#include <Libkleo/KeyCache>
+
 #include <KLocalizedString>
 
 #include <QInputDialog>
 #include <QDateTime>
 #include <QStringList>
 
 #include <qgpgme/dataprovider.h>
 
 #include <gpgme++/context.h>
 
 #include "kleopatra_debug.h"
 
 using namespace Kleo;
 using namespace Kleo::Commands;
 using namespace Kleo::SmartCard;
 using namespace GpgME;
 
 class KeyToCardCommand::Private : public Command::Private
 {
     friend class ::Kleo::Commands::KeyToCardCommand;
     KeyToCardCommand *q_func() const
     {
         return static_cast<KeyToCardCommand *>(q);
     }
 public:
     explicit Private(KeyToCardCommand *qq, KeyListController *c);
     explicit Private(KeyToCardCommand *qq, const GpgME::Subkey &key, const std::string &serialno);
+    explicit Private(KeyToCardCommand *qq, const std::string &cardSlot, const std::string &serialno);
     ~Private();
 
 private:
     void start();
+
     void startTransferToOpenPGPCard();
+
     void startTransferToPIVCard();
     void startKeyToPIVCard();
     void startCertificateToPIVCard();
     void authenticate();
     void authenticationFinished();
     void authenticationCanceled();
 
 private:
     std::string mSerial;
     GpgME::Subkey mSubkey;
     std::string cardSlot;
     bool overwriteExistingAlreadyApproved = false;
     bool hasBeenCanceled = false;
 };
 
 KeyToCardCommand::Private *KeyToCardCommand::d_func()
 {
     return static_cast<Private *>(d.get());
 }
 const KeyToCardCommand::Private *KeyToCardCommand::d_func() const
 {
     return static_cast<const Private *>(d.get());
 }
 
 #define q q_func()
 #define d d_func()
 
 
 KeyToCardCommand::Private::Private(KeyToCardCommand *qq, KeyListController *c)
     : Command::Private(qq, c)
 {
 }
 
 KeyToCardCommand::Private::Private(KeyToCardCommand *qq,
                                    const GpgME::Subkey &key,
                                    const std::string &serialno)
     : Command::Private(qq, nullptr),
       mSerial(serialno),
       mSubkey(key)
 {
 }
 
+KeyToCardCommand::Private::Private(KeyToCardCommand *qq, const std::string &cardSlot_, const std::string &serialno)
+    : Command::Private(qq, nullptr)
+    , mSerial(serialno)
+    , cardSlot(cardSlot_)
+{
+}
+
 KeyToCardCommand::Private::~Private()
 {
 }
 
 void KeyToCardCommand::Private::start()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::Private::start()";
 
+    // for now we always use the first smart card
+    if (mSerial.empty()) {
+        const auto cards = SmartCard::ReaderStatus::instance()->getCards();
+        if (!cards.size() || cards[0]->serialNumber().empty()) {
+            error(i18n("Failed to find a smart card."));
+            finished();
+            return;
+        }
+        mSerial = cards[0]->serialNumber();
+    }
+
     const auto card = SmartCard::ReaderStatus::instance()->getCard<Card>(mSerial);
     if (!card) {
         error(i18n("Failed to find the card with the serial number: %1", QString::fromStdString(mSerial)));
         finished();
         return;
     }
 
     switch (card->appType()) {
     case SmartCard::Card::OpenPGPApplication: {
-        if (mSubkey.parent().protocol() == GpgME::OpenPGP) {
-            startTransferToOpenPGPCard();
-        }
-        else {
-            error(i18n("Sorry! This key cannot be transferred to an OpenPGP card."));
-            finished();
-        }
+        startTransferToOpenPGPCard();
     }
     break;
     case SmartCard::Card::PivApplication: {
-        if (mSubkey.parent().protocol() == GpgME::CMS) {
-            startTransferToPIVCard();
-        } else {
-            error(i18n("Sorry! This key cannot be transferred to a PIV card."));
-            finished();
-        }
+        startTransferToPIVCard();
     }
     break;
     default: {
         error(i18n("Sorry! Transferring keys to this card is not supported."));
         finished();
+        return;
     }
     }
 }
 
 namespace {
+static GpgME::Subkey getSubkeyToTransferToOpenPGPCard(const std::vector<Key> &keys)
+{
+    if (keys.size() == 1 && keys.front().hasSecret()) {
+        return keys.front().subkey(0);
+    }
+    return GpgME::Subkey();
+}
+
 static int getOpenPGPCardSlotForKey(const GpgME::Subkey &subKey, QWidget *parent)
 {
     // Check if we need to ask the user for the slot
     if ((subKey.canSign() || subKey.canCertify()) && !subKey.canEncrypt() && !subKey.canAuthenticate()) {
         // Signing only
         return 1;
     }
     if (subKey.canEncrypt() && !(subKey.canSign() || subKey.canCertify()) && !subKey.canAuthenticate()) {
         // Encrypt only
         return 2;
     }
     if (subKey.canAuthenticate() && !(subKey.canSign() || subKey.canCertify()) && !subKey.canEncrypt()) {
         // Auth only
         return 3;
     }
     // Multiple uses, ask user.
     QStringList options;
 
     if (subKey.canSign() || subKey.canCertify()) {
         options << i18nc("Placeholder is the number of a slot on a smart card", "Signature (%1)", 1);
     }
     if (subKey.canEncrypt()) {
         options << i18nc("Placeholder is the number of a slot on a smart card", "Encryption (%1)", 2);
     }
     if (subKey.canAuthenticate()) {
         options << i18nc("Placeholder is the number of a slot on a smart card", "Authentication (%1)", 3);
     }
 
     bool ok;
     const QString choice = QInputDialog::getItem(parent, i18n("Select Card Slot"),
         i18n("Please select the card slot the key should be written to:"), options, /* current= */ 0, /* editable= */ false, &ok);
     const int slot = options.indexOf(choice) + 1;
     return ok ? slot : -1;
 }
 }
 
 void KeyToCardCommand::Private::startTransferToOpenPGPCard() {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::Private::startTransferToOpenPGPCard()";
 
     const auto pgpCard = SmartCard::ReaderStatus::instance()->getCard<OpenPGPCard>(mSerial);
     if (!pgpCard) {
         error(i18n("Failed to find the OpenPGP card with the serial number: %1", QString::fromStdString(mSerial)));
         finished();
         return;
     }
 
+    if (mSubkey.isNull()) {
+        mSubkey = getSubkeyToTransferToOpenPGPCard(keys());
+    }
+    if (mSubkey.isNull()) {
+        finished();
+        return;
+    }
+    if (mSubkey.parent().protocol() != GpgME::OpenPGP) {
+        error(i18n("Sorry! This key cannot be transferred to an OpenPGP card."));
+        finished();
+        return;
+    }
+
     const auto slot = getOpenPGPCardSlotForKey(mSubkey, parentWidgetOrView());
     if (slot < 1) {
         finished();
         return;
     }
 
     // Check if we need to do the overwrite warning.
     std::string existingKey;
     QString encKeyWarning;
     if (slot == 1) {
         existingKey = pgpCard->sigFpr();
     } else if (slot == 2) {
         existingKey = pgpCard->encFpr();
         encKeyWarning = i18n("It will no longer be possible to decrypt past communication "
                                 "encrypted for the existing key.");
     } else if (slot == 3) {
         existingKey = pgpCard->authFpr();
     }
     if (!existingKey.empty()) {
         const QString message = i18nc("@info",
             "<p>This card already contains a key in this slot. Continuing will <b>overwrite</b> that key.</p>"
             "<p>If there is no backup the existing key will be irrecoverably lost.</p>") +
             i18n("The existing key has the fingerprint:") +
             QStringLiteral("<pre>%1</pre>").arg(QString::fromStdString(existingKey)) +
             encKeyWarning;
         const auto choice = KMessageBox::warningContinueCancel(parentWidgetOrView(), message,
             i18nc("@title:window", "Overwrite existing key"),
             KStandardGuiItem::cont(), KStandardGuiItem::cancel(), QString(), KMessageBox::Notify | KMessageBox::Dangerous);
         if (choice != KMessageBox::Continue) {
             finished();
             return;
         }
     }
 
     // Now do the deed
     const auto time = QDateTime::fromSecsSinceEpoch(mSubkey.creationTime());
     const auto timestamp = time.toString(QStringLiteral("yyyyMMdd'T'HHmmss"));
     const QString cmd = QStringLiteral("KEYTOCARD --force %1 %2 OPENPGP.%3 %4")
         .arg(QString::fromLatin1(mSubkey.keyGrip()), QString::fromStdString(mSerial))
         .arg(slot)
         .arg(timestamp);
     ReaderStatus::mutableInstance()->startSimpleTransaction(cmd.toUtf8(), q_func(), "keyToOpenPGPCardDone");
 }
 
 namespace {
+static GpgME::Subkey getSubkeyToTransferToPIVCard(const std::vector<Key> &keys, const std::string &cardSlot, const std::shared_ptr<PIVCard> &card)
+{
+    if (!cardSlot.empty()) {
+        if (cardSlot == PIVCard::digitalSignatureKeyRef()) {
+            // get signing certificate matching the key grip
+            const std::string cardKeygrip = card->keyGrip(cardSlot);
+            const auto subkey = KeyCache::instance()->findSubkeyByKeyGrip(cardKeygrip);
+            if (subkey.canSign() && subkey.parent().protocol() == GpgME::CMS) {
+                return subkey;
+            }
+        }
+        if (cardSlot == PIVCard::keyManagementKeyRef()) {
+            // get encryption certificate with secret subkey
+        }
+        return GpgME::Subkey();
+    }
+
+    if (keys.size() == 1) {
+        return keys.front().subkey(0);
+    }
+    return GpgME::Subkey();
+}
+
 static std::string getPIVCardSlotForKey(const GpgME::Subkey &subKey, QWidget *parent)
 {
     // Check if we need to ask the user for the slot
     if (subKey.canSign() && !subKey.canEncrypt()) {
         // Signing only
         return PIVCard::digitalSignatureKeyRef();
     }
     if (subKey.canEncrypt() && !subKey.canSign()) {
         // Encrypt only
         return PIVCard::keyManagementKeyRef();
     }
 
     // Multiple uses, ask user.
     QMap<QString, std::string> options;
 
     if (subKey.canSign()) {
         options.insert(i18nc("Placeholder 1 is the name of a key, e.g. 'Digital Signature Key'; "
                              "placeholder 2 is the identifier of a slot on a smart card", "%1 (%2)",
                              PIVCard::keyDisplayName(PIVCard::digitalSignatureKeyRef()), QString::fromStdString(PIVCard::digitalSignatureKeyRef())),
                        PIVCard::digitalSignatureKeyRef());
     }
     if (subKey.canEncrypt()) {
         options.insert(i18nc("Placeholder 1 is the name of a key, e.g. 'Digital Signature Key'; "
                              "placeholder 2 is the identifier of a slot on a smart card", "%1 (%2)",
                              PIVCard::keyDisplayName(PIVCard::keyManagementKeyRef()), QString::fromStdString(PIVCard::keyManagementKeyRef())),
                        PIVCard::keyManagementKeyRef());
     }
 
     bool ok;
     const QString choice = QInputDialog::getItem(parent, i18n("Select Card Slot"),
         i18n("Please select the card slot the certificate should be written to:"), options.keys(), /* current= */ 0, /* editable= */ false, &ok);
     const std::string slot = options.value(choice);
     return ok ? slot : std::string();
 }
 }
 
 void KeyToCardCommand::Private::startTransferToPIVCard()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::Private::startTransferToPIVCard()";
 
     const auto pivCard = SmartCard::ReaderStatus::instance()->getCard<PIVCard>(mSerial);
     if (!pivCard) {
         error(i18n("Failed to find the PIV card with the serial number: %1", QString::fromStdString(mSerial)));
         finished();
         return;
     }
 
+    if (mSubkey.isNull()) {
+        mSubkey = getSubkeyToTransferToPIVCard(keys(), cardSlot, pivCard);
+    }
+    if (mSubkey.isNull()) {
+        if (!cardSlot.empty()) {
+            error(i18n("Sorry! No suitable certificate to write to this card slot was found."));
+        }
+        finished();
+        return;
+    }
+    if (mSubkey.parent().protocol() != GpgME::CMS) {
+        error(i18n("Sorry! This key cannot be transferred to a PIV card."));
+        finished();
+        return;
+    }
     if (!mSubkey.canEncrypt() && !mSubkey.canSign()) {
         error(i18n("Sorry! Only encryption keys and signing keys can be transferred to a PIV card."));
         finished();
         return;
     }
 
     // get card slot unless it was already selected before authentication was performed
     if (cardSlot.empty()) {
         cardSlot = getPIVCardSlotForKey(mSubkey, parentWidgetOrView());
         if (cardSlot.empty()) {
             finished();
             return;
         }
     }
 
     if (cardSlot == PIVCard::keyManagementKeyRef()) {
         startKeyToPIVCard();
     } else {
         // skip key to card because it's only supported for encryption keys
         startCertificateToPIVCard();
     }
 }
 
 void KeyToCardCommand::Private::startKeyToPIVCard()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::Private::startKeyToPIVCard()";
 
     const auto pivCard = SmartCard::ReaderStatus::instance()->getCard<PIVCard>(mSerial);
     if (!pivCard) {
         error(i18n("Failed to find the PIV card with the serial number: %1", QString::fromStdString(mSerial)));
         finished();
         return;
     }
 
     // Check if we need to do the overwrite warning.
     if (!overwriteExistingAlreadyApproved) {
         const std::string existingKey = pivCard->keyGrip(cardSlot);
         if (!existingKey.empty() && (existingKey != mSubkey.keyGrip())) {
             const QString decryptionWarning = (cardSlot == PIVCard::keyManagementKeyRef()) ?
                 i18n("It will no longer be possible to decrypt past communication encrypted for the existing key.") :
                 QString();
             const QString message = i18nc("@info",
                 "<p>This card already contains a key in this slot. Continuing will <b>overwrite</b> that key.</p>"
                 "<p>If there is no backup the existing key will be irrecoverably lost.</p>") +
                 i18n("The existing key has the key grip:") +
                 QStringLiteral("<pre>%1</pre>").arg(QString::fromStdString(existingKey)) +
                 decryptionWarning;
             const auto choice = KMessageBox::warningContinueCancel(parentWidgetOrView(), message,
                 i18nc("@title:window", "Overwrite existing key"),
                 KStandardGuiItem::cont(), KStandardGuiItem::cancel(), QString(), KMessageBox::Notify | KMessageBox::Dangerous);
             if (choice != KMessageBox::Continue) {
                 finished();
                 return;
             }
             overwriteExistingAlreadyApproved = true;
         }
     }
 
     const QString cmd = QStringLiteral("KEYTOCARD --force %1 %2 %3")
         .arg(QString::fromLatin1(mSubkey.keyGrip()), QString::fromStdString(mSerial))
         .arg(QString::fromStdString(cardSlot));
     ReaderStatus::mutableInstance()->startSimpleTransaction(cmd.toUtf8(), q_func(), "keyToPIVCardDone");
 }
 
 void KeyToCardCommand::Private::startCertificateToPIVCard()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::Private::startCertificateToPIVCard()";
 
     const auto pivCard = SmartCard::ReaderStatus::instance()->getCard<PIVCard>(mSerial);
     if (!pivCard) {
         error(i18n("Failed to find the PIV card with the serial number: %1", QString::fromStdString(mSerial)));
         finished();
         return;
     }
 
     // verify that public keys on the card and in the certificate match
     const std::string cardKeygrip = pivCard->keyGrip(cardSlot);
     const std::string certificateKeygrip = mSubkey.keyGrip();
     if (cardKeygrip != certificateKeygrip) {
         error(i18n("<p>The certificate does not seem to correspond to the key on the card.</p>"
                    "<p>Public key on card: %1<br>"
                    "Public key of certificate: %2</p>",
                    QString::fromStdString(cardKeygrip),
                    QString::fromStdString(certificateKeygrip)));
         finished();
         return;
     }
 
     auto ctx = Context::createForProtocol(GpgME::CMS);
     QGpgME::QByteArrayDataProvider dp;
     Data data(&dp);
     const Error err = ctx->exportPublicKeys(mSubkey.parent().primaryFingerprint(), data);
     if (err) {
         error(i18nc("@info", "Exporting the certificate failed: %1", QString::fromUtf8(err.asString())),
               i18nc("@title", "Error"));
         finished();
         return;
     }
     const QByteArray certificateData = dp.data();
 
     const QString cmd = QStringLiteral("SCD WRITECERT %1")
         .arg(QString::fromStdString(cardSlot));
     auto transaction = std::unique_ptr<AssuanTransaction>(new WriteCertAssuanTransaction(certificateData));
     ReaderStatus::mutableInstance()->startTransaction(cmd.toUtf8(), q_func(), "certificateToPIVCardDone", std::move(transaction));
 }
 
 void KeyToCardCommand::Private::authenticate()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::authenticate()";
 
     auto cmd = new AuthenticatePIVCardApplicationCommand(mSerial, parentWidgetOrView());
     connect(cmd, &AuthenticatePIVCardApplicationCommand::finished,
             q, [this]() { authenticationFinished(); });
     connect(cmd, &AuthenticatePIVCardApplicationCommand::canceled,
             q, [this]() { authenticationCanceled(); });
     cmd->start();
 }
 
 void KeyToCardCommand::Private::authenticationFinished()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::authenticationFinished()";
     if (!hasBeenCanceled) {
         startTransferToPIVCard();
     }
 }
 
 void KeyToCardCommand::Private::authenticationCanceled()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::authenticationCanceled()";
     hasBeenCanceled = true;
     canceled();
 }
 
 KeyToCardCommand::KeyToCardCommand(KeyListController *c)
     : Command(new Private(this, c))
 {
 }
 
 KeyToCardCommand::KeyToCardCommand(QAbstractItemView *v, KeyListController *c)
     : Command(v, new Private(this, c))
 {
 }
 
 KeyToCardCommand::KeyToCardCommand(const GpgME::Key &key)
     : Command(key, new Private(this, nullptr))
 {
 }
 
 KeyToCardCommand::KeyToCardCommand(const GpgME::Subkey &key, const std::string &serialno)
     : Command(new Private(this, key, serialno))
 {
 }
 
+KeyToCardCommand::KeyToCardCommand(const std::string& cardSlot, const std::string &serialno)
+    : Command(new Private(this, cardSlot, serialno))
+{
+}
+
 KeyToCardCommand::~KeyToCardCommand()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::~KeyToCardCommand()";
 }
 
 bool KeyToCardCommand::supported()
 {
     return true;
 }
 
 void KeyToCardCommand::keyToOpenPGPCardDone(const GpgME::Error &err)
 {
     if (err) {
         d->error(i18nc("@info",
                        "Moving the key to the card failed: %1", QString::fromUtf8(err.asString())),
                         i18nc("@title", "Error"));
     } else if (!err.isCanceled()) {
         /* TODO DELETE_KEY is too strong, because it also deletes the stub
          * of the secret key. I could not find out how GnuPG does this. Question
          * to GnuPG Developers is pending an answer
         if (KMessageBox::questionYesNo(d->parentWidgetOrView(),
                                        i18n("Do you want to delete the key on this computer?"),
                                        i18nc("@title:window",
                                        "Key transferred to card")) == KMessageBox::Yes) {
             const QString cmd = QStringLiteral("DELETE_KEY --force %1").arg(d->mSubkey.keyGrip());
             // Using readerstatus is a bit overkill but it's an easy way to talk to the agent.
             ReaderStatus::mutableInstance()->startSimpleTransaction(cmd.toUtf8(), this, "deleteDone");
         }
         */
         KMessageBox::information(d->parentWidgetOrView(),
                                  i18n("Successfully copied the key to the card."),
                                  i18nc("@title", "Success"));
     }
     d->finished();
 }
 
 void KeyToCardCommand::keyToPIVCardDone(const GpgME::Error &err)
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::keyToPIVCardDone():"
                            << err.asString() << "(" << err.code() << ")";
     if (!err && !err.isCanceled()) {
         d->startCertificateToPIVCard();
         return;
     }
 
     if (err) {
         // gpgme 1.13 reports "BAD PIN" instead of "NO AUTH"
         if (err.code() == GPG_ERR_NO_AUTH || err.code() == GPG_ERR_BAD_PIN) {
             d->authenticate();
             return;
         }
 
         d->error(i18nc("@info",
                        "Moving the key to the card failed: %1", QString::fromUtf8(err.asString())),
                         i18nc("@title", "Error"));
     }
 
     d->finished();
 }
 
 void KeyToCardCommand::certificateToPIVCardDone(const GpgME::Error &err)
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::certificateToPIVCardDone():"
                            << err.asString() << "(" << err.code() << ")";
     if (err) {
         // gpgme 1.13 reports "BAD PIN" instead of "NO AUTH"
         if (err.code() == GPG_ERR_NO_AUTH || err.code() == GPG_ERR_BAD_PIN) {
             d->authenticate();
             return;
         }
 
         d->error(i18nc("@info",
                        "Writing the certificate to the card failed: %1", QString::fromUtf8(err.asString())),
                         i18nc("@title", "Error"));
     } else if (!err.isCanceled()) {
         KMessageBox::information(d->parentWidgetOrView(),
                                  i18n("Successfully copied the certificate to the card."),
                                  i18nc("@title", "Success"));
         ReaderStatus::mutableInstance()->updateStatus();
     }
 
     d->finished();
 }
 
 void KeyToCardCommand::deleteDone(const GpgME::Error &err)
 {
     if (err) {
         d->error(i18nc("@info", "Failed to delete the key: %1", QString::fromUtf8(err.asString())),
                         i18nc("@title", "Error"));
     }
     d->finished();
 }
 
 void KeyToCardCommand::doStart()
 {
     qCDebug(KLEOPATRA_LOG) << "KeyToCardCommand::doStart()";
 
-    if (d->mSubkey.isNull()) {
-        const std::vector<Key> keys = d->keys();
-        if (keys.size() != 1 ||
-                !keys.front().hasSecret() ||
-                keys.front().subkey(0).isNull()) {
-            d->finished();
-            return;
-        }
-        d->mSubkey = keys.front().subkey(0);
-    }
-
-    if (d->mSerial.empty()) {
-        const auto cards = SmartCard::ReaderStatus::instance()->getCards();
-        if (!cards.size() || cards[0]->serialNumber().empty()) {
-            d->error(i18n("Failed to find a smart card."));
-            d->finished();
-            return;
-        }
-        d->mSerial = cards[0]->serialNumber();
-    }
-
     d->start();
 }
 
 void KeyToCardCommand::doCancel()
 {
 }
 
 #undef q_func
 #undef d_func
diff --git a/src/commands/keytocardcommand.h b/src/commands/keytocardcommand.h
index 30a216994..f86628e57 100644
--- a/src/commands/keytocardcommand.h
+++ b/src/commands/keytocardcommand.h
@@ -1,59 +1,60 @@
 /*  commands/keytocardcommand.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2017 Bundesamt für Sicherheit in der Informationstechnik
     SPDX-FileContributor: Intevation GmbH
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef __KLEOPATRA_COMMANDS_KEYTOCARDCOMMAND_H__
 #define __KLEOPATRA_COMMANDS_KEYTOCARDCOMMAND_H__
 
 #include <commands/command.h>
 
 #include <string>
 #include <gpgme++/key.h>
 
 namespace Kleo
 {
 namespace Commands
 {
 
 class KeyToCardCommand : public Command
 {
     Q_OBJECT
 public:
     explicit KeyToCardCommand(KeyListController *parent);
     explicit KeyToCardCommand(QAbstractItemView *view, KeyListController *parent);
     explicit KeyToCardCommand(const GpgME::Key &key);
     KeyToCardCommand(const GpgME::Subkey &key, const std::string &serialno);
+    KeyToCardCommand(const std::string& cardSlot, const std::string &serialno);
     ~KeyToCardCommand() override;
 
     /* reimp */ static Restrictions restrictions()
     {
         return OnlyOneKey | NeedSecretKey | NeedsSmartCard;
     }
 
     static bool supported();
 
 public Q_SLOTS:
     void keyToOpenPGPCardDone(const GpgME::Error &err);
     void keyToPIVCardDone(const GpgME::Error &err);
     void certificateToPIVCardDone(const GpgME::Error &err);
     void deleteDone(const GpgME::Error &err);
 
 private:
     void doStart() override;
     void doCancel() override;
 
 private:
     class Private;
     inline Private *d_func();
     inline const Private *d_func() const;
 };
 
 }
 }
 
 #endif /* __KLEOPATRA_COMMANDS_KEYTOCARDCOMMAND_H__ */
diff --git a/src/view/pivcardwidget.cpp b/src/view/pivcardwidget.cpp
index e0104dd82..262784920 100644
--- a/src/view/pivcardwidget.cpp
+++ b/src/view/pivcardwidget.cpp
@@ -1,252 +1,274 @@
 /*  view/pivcardwiget.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "pivcardwidget.h"
 
 #include "commands/changepincommand.h"
+#include "commands/keytocardcommand.h"
 #include "commands/pivgeneratecardkeycommand.h"
 #include "commands/setpivcardapplicationadministrationkeycommand.h"
 
 #include "smartcard/pivcard.h"
 #include "smartcard/readerstatus.h"
 
 #include <QFrame>
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
 #include <QScrollArea>
 #include <QVBoxLayout>
 
 #include <KLocalizedString>
 #include <KMessageBox>
 
 using namespace Kleo;
 using namespace Kleo::Commands;
 using namespace Kleo::SmartCard;
 
 namespace {
 static QString formatVersion(int value)
 {
     if (value < 0) {
         return QLatin1String("n/a");
     }
 
     const unsigned int a = ((value >> 24) & 0xff);
     const unsigned int b = ((value >> 16) & 0xff);
     const unsigned int c = ((value >>  8) & 0xff);
     const unsigned int d = ((value      ) & 0xff);
     if (a) {
         return QStringLiteral("%1.%2.%3.%4").arg(QString::number(a), QString::number(b), QString::number(c), QString::number(d));
     } else if (b) {
         return QStringLiteral("%1.%2.%3").arg(QString::number(b), QString::number(c), QString::number(d));
     } else if (c) {
         return QStringLiteral("%1.%2").arg(QString::number(c), QString::number(d));
     }
     return QString::number(d);
 }
 } // Namespace
 
 PIVCardWidget::PIVCardWidget(QWidget *parent):
     QWidget(parent),
     mSerialNumber(new QLabel(this)),
     mVersionLabel(new QLabel(this)),
     mPIVAuthenticationKey(new QLabel(this)),
     mCardAuthenticationKey(new QLabel(this)),
     mDigitalSignatureKey(new QLabel(this)),
     mKeyManagementKey(new QLabel(this)),
     mGeneratePIVAuthenticationKeyBtn(new QPushButton(this)),
     mGenerateCardAuthenticationKeyBtn(new QPushButton(this)),
     mGenerateDigitalSignatureKeyBtn(new QPushButton(this)),
+    mWriteDigitalSignatureKeyBtn(new QPushButton(this)),
     mGenerateKeyManagementKeyBtn(new QPushButton(this))
 {
     auto grid = new QGridLayout;
     int row = 0;
 
     // Set up the scroll are
     auto area = new QScrollArea;
     area->setFrameShape(QFrame::NoFrame);
     area->setWidgetResizable(true);
     auto areaWidget = new QWidget;
     auto areaVLay = new QVBoxLayout(areaWidget);
     areaVLay->addLayout(grid);
     areaVLay->addStretch(1);
     area->setWidget(areaWidget);
     auto myLayout = new QVBoxLayout(this);
     myLayout->addWidget(area);
 
     // Version and Serialnumber
     grid->addWidget(mVersionLabel, row++, 0, 1, 2);
     mVersionLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
     grid->addWidget(new QLabel(i18n("Serial number:")), row, 0);
 
     grid->addWidget(mSerialNumber, row++, 1);
     mSerialNumber->setTextInteractionFlags(Qt::TextBrowserInteraction);
 
     // The keys
     auto line1 = new QFrame();
     line1->setFrameShape(QFrame::HLine);
     grid->addWidget(line1, row++, 0, 1, 4);
     grid->addWidget(new QLabel(QStringLiteral("<b>%1</b>").arg(i18n("Keys:"))), row++, 0);
 
     grid->addWidget(new QLabel(i18n("PIV authentication:")), row, 0);
     grid->addWidget(mPIVAuthenticationKey, row, 1);
     mPIVAuthenticationKey->setTextInteractionFlags(Qt::TextBrowserInteraction);
     mGeneratePIVAuthenticationKeyBtn->setText(i18n("Generate"));
     mGeneratePIVAuthenticationKeyBtn->setEnabled(false);
     grid->addWidget(mGeneratePIVAuthenticationKeyBtn, row, 2);
     connect(mGeneratePIVAuthenticationKeyBtn, &QPushButton::clicked, this, &PIVCardWidget::generatePIVAuthenticationKey);
     row++;
 
     grid->addWidget(new QLabel(i18n("Card authentication:")), row, 0);
     grid->addWidget(mCardAuthenticationKey, row, 1);
     mCardAuthenticationKey->setTextInteractionFlags(Qt::TextBrowserInteraction);
     mGenerateCardAuthenticationKeyBtn->setText(i18n("Generate"));
-    mGeneratePIVAuthenticationKeyBtn->setEnabled(false);
+    mGenerateCardAuthenticationKeyBtn->setEnabled(false);
     grid->addWidget(mGenerateCardAuthenticationKeyBtn, row, 2);
     connect(mGenerateCardAuthenticationKeyBtn, &QPushButton::clicked, this, &PIVCardWidget::generateCardAuthenticationKey);
     row++;
 
     grid->addWidget(new QLabel(i18n("Digital signature:")), row, 0);
     grid->addWidget(mDigitalSignatureKey, row, 1);
     mDigitalSignatureKey->setTextInteractionFlags(Qt::TextBrowserInteraction);
     mGenerateDigitalSignatureKeyBtn->setText(i18n("Generate"));
-    mGeneratePIVAuthenticationKeyBtn->setEnabled(false);
+    mGenerateDigitalSignatureKeyBtn->setEnabled(false);
     grid->addWidget(mGenerateDigitalSignatureKeyBtn, row, 2);
     connect(mGenerateDigitalSignatureKeyBtn, &QPushButton::clicked, this, &PIVCardWidget::generateDigitalSignatureKey);
+    mWriteDigitalSignatureKeyBtn->setText(i18n("Write Certificate"));
+    mWriteDigitalSignatureKeyBtn->setToolTip(i18n("Write the certificate corresponding to this key to the card"));
+    mWriteDigitalSignatureKeyBtn->setEnabled(false);
+    grid->addWidget(mWriteDigitalSignatureKeyBtn, row, 3);
+    connect(mWriteDigitalSignatureKeyBtn, &QPushButton::clicked, this, [this] () { writeKeyToCard(PIVCard::digitalSignatureKeyRef()); });
     row++;
 
     grid->addWidget(new QLabel(i18n("Key management:")), row, 0);
     grid->addWidget(mKeyManagementKey, row, 1);
     mKeyManagementKey->setTextInteractionFlags(Qt::TextBrowserInteraction);
     mGenerateKeyManagementKeyBtn->setText(i18n("Generate"));
-    mGeneratePIVAuthenticationKeyBtn->setEnabled(false);
+    mGenerateKeyManagementKeyBtn->setEnabled(false);
     grid->addWidget(mGenerateKeyManagementKeyBtn, row, 2);
     connect(mGenerateKeyManagementKeyBtn, &QPushButton::clicked, this, &PIVCardWidget::generateKeyManagementKey);
     row++;
 
     auto line2 = new QFrame();
     line2->setFrameShape(QFrame::HLine);
     grid->addWidget(line2, row++, 0, 1, 4);
 
     auto actionLayout = new QHBoxLayout;
 
     {
         auto button = new QPushButton(i18n("Change PIN"));
         button->setToolTip(i18n("Change the PIV Card Application PIN that activates the PIV Card and enables private key operations using the stored keys."));
         actionLayout->addWidget(button);
         connect(button, &QPushButton::clicked, this, [this] () { changePin(PIVCard::pinKeyRef()); });
     }
     {
         auto button = new QPushButton(i18n("Change PUK"));
         button->setToolTip(i18n("Change the PIN Unblocking Key that enables a reset of the PIN."));
         actionLayout->addWidget(button);
         connect(button, &QPushButton::clicked, this, [this] () { changePin(PIVCard::pukKeyRef()); });
     }
     {
         auto button = new QPushButton(i18n("Change Admin Key"));
         button->setToolTip(i18n("Change the PIV Card Application Administration Key that is used by the "
             "PIV Card Application to authenticate the PIV Card Application Administrator and by the "
             "administrator (resp. Kleopatra) to authenticate the PIV Card Application."));
         actionLayout->addWidget(button);
         connect(button, &QPushButton::clicked, this, [this] () { setAdminKey(); });
     }
 
     actionLayout->addStretch(-1);
     grid->addLayout(actionLayout, row++, 0, 1, 4);
 
     grid->setColumnStretch(4, -1);
 }
 
 PIVCardWidget::~PIVCardWidget()
 {
 }
 
 void PIVCardWidget::setCard(const PIVCard *card)
 {
     mCardSerialNumber = card->serialNumber();
     mVersionLabel->setText(i18nc("Placeholder is a version number", "PIV v%1 card", formatVersion(card->appVersion())));
 
     if (card->displaySerialNumber() != card->serialNumber()) {
         mSerialNumber->setText(QStringLiteral("%1 (%2)").arg(QString::fromStdString(card->displaySerialNumber()),
                                                              QString::fromStdString(card->serialNumber())));
     } else {
         mSerialNumber->setText(QString::fromStdString(card->serialNumber()));
     }
 
-    updateKey(PIVCard::pivAuthenticationKeyRef(), card, mPIVAuthenticationKey, mGeneratePIVAuthenticationKeyBtn);
-    updateKey(PIVCard::cardAuthenticationKeyRef(), card, mCardAuthenticationKey, mGenerateCardAuthenticationKeyBtn);
-    updateKey(PIVCard::digitalSignatureKeyRef(), card, mDigitalSignatureKey, mGenerateDigitalSignatureKeyBtn);
-    updateKey(PIVCard::keyManagementKeyRef(), card, mKeyManagementKey, mGenerateKeyManagementKeyBtn);
+    updateKey(PIVCard::pivAuthenticationKeyRef(), card, mPIVAuthenticationKey, mGeneratePIVAuthenticationKeyBtn, nullptr);
+    updateKey(PIVCard::cardAuthenticationKeyRef(), card, mCardAuthenticationKey, mGenerateCardAuthenticationKeyBtn, nullptr);
+    updateKey(PIVCard::digitalSignatureKeyRef(), card, mDigitalSignatureKey, mGenerateDigitalSignatureKeyBtn, mWriteDigitalSignatureKeyBtn);
+    updateKey(PIVCard::keyManagementKeyRef(), card, mKeyManagementKey, mGenerateKeyManagementKeyBtn, nullptr);
 }
 
-void PIVCardWidget::updateKey(const std::string &keyRef, const PIVCard *card, QLabel *label, QPushButton *button)
+void PIVCardWidget::updateKey(const std::string &keyRef, const PIVCard *card, QLabel *label, QPushButton *generateButton, QPushButton *writeButton)
 {
     const std::string grip = card->keyGrip(keyRef);
     label->setText(grip.empty() ? i18n("Slot empty") : QString::fromStdString(grip));
-    button->setText(grip.empty() ? i18n("Generate") : i18n("Replace"));
-    button->setToolTip(grip.empty() ?
+    generateButton->setText(grip.empty() ? i18n("Generate") : i18n("Replace"));
+    generateButton->setToolTip(grip.empty() ?
         i18nc("Placeholder is the display name of a key", "Generate %1", PIVCard::keyDisplayName(keyRef)) :
         i18nc("Placeholder is the display name of a key", "Replace %1 with new key", PIVCard::keyDisplayName(keyRef)));
-    button->setEnabled(true);
+    generateButton->setEnabled(true);
+    if (writeButton) {
+        writeButton->setEnabled(!grip.empty());
+    }
 }
 
 void PIVCardWidget::generateKey(const std::string &keyref)
 {
     auto cmd = new PIVGenerateCardKeyCommand(mCardSerialNumber, this);
     this->setEnabled(false);
     connect(cmd, &PIVGenerateCardKeyCommand::finished,
             this, [this]() {
                 this->setEnabled(true);
             });
     cmd->setKeyRef(keyref);
     cmd->start();
 }
 
+void PIVCardWidget::writeKeyToCard(const std::string &keyref)
+{
+    auto cmd = new KeyToCardCommand(keyref, mCardSerialNumber);
+    this->setEnabled(false);
+    connect(cmd, &KeyToCardCommand::finished,
+            this, [this]() {
+                this->setEnabled(true);
+            });
+    cmd->setParentWidget(this);
+    cmd->start();
+}
+
 void PIVCardWidget::generatePIVAuthenticationKey()
 {
     generateKey(PIVCard::pivAuthenticationKeyRef());
 }
 
 void PIVCardWidget::generateCardAuthenticationKey()
 {
     generateKey(PIVCard::cardAuthenticationKeyRef());
 }
 
 void PIVCardWidget::generateDigitalSignatureKey()
 {
     generateKey(PIVCard::digitalSignatureKeyRef());
 }
 
 void PIVCardWidget::generateKeyManagementKey()
 {
     generateKey(PIVCard::keyManagementKeyRef());
 }
 
 void PIVCardWidget::changePin(const std::string &keyRef)
 {
     auto cmd = new ChangePinCommand(mCardSerialNumber, this);
     this->setEnabled(false);
     connect(cmd, &ChangePinCommand::finished,
             this, [this]() {
                 this->setEnabled(true);
             });
     cmd->setKeyRef(keyRef);
     cmd->start();
 }
 
 void PIVCardWidget::setAdminKey()
 {
     auto cmd = new SetPIVCardApplicationAdministrationKeyCommand(mCardSerialNumber, this);
     this->setEnabled(false);
     connect(cmd, &SetPIVCardApplicationAdministrationKeyCommand::finished,
             this, [this]() {
                 this->setEnabled(true);
             });
     cmd->start();
 }
diff --git a/src/view/pivcardwidget.h b/src/view/pivcardwidget.h
index 57c673d23..2305ec42a 100644
--- a/src/view/pivcardwidget.h
+++ b/src/view/pivcardwidget.h
@@ -1,63 +1,65 @@
 /*  view/pivcardwiget.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2020 g10 Code GmbH
     SPDX-FileContributor: Ingo Klöcker <dev@ingo-kloecker.de>
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 #ifndef VIEW_PIVCARDWIDGET_H
 #define VIEW_PIVCARDWIDGET_H
 
 #include <QWidget>
 
 #include <gpgme++/error.h>
 
 class QLabel;
 class QPushButton;
 
 namespace Kleo
 {
 
 namespace SmartCard
 {
 class PIVCard;
 } // namespace SmartCard
 
 class PIVCardWidget: public QWidget
 {
     Q_OBJECT
 public:
     explicit PIVCardWidget(QWidget *parent = nullptr);
     ~PIVCardWidget();
 
     void setCard(const SmartCard::PIVCard* card);
 
 private:
-    void updateKey(const std::string &keyRef, const SmartCard::PIVCard *card, QLabel *label, QPushButton *button);
+    void updateKey(const std::string &keyRef, const SmartCard::PIVCard *card, QLabel *label, QPushButton *generateButton, QPushButton *writeButton);
     void generateKey(const std::string &keyref);
+    void writeKeyToCard(const std::string &keyref);
     void changePin(const std::string &keyRef);
     void setAdminKey();
 
 private Q_SLOTS:
     void generatePIVAuthenticationKey();
     void generateCardAuthenticationKey();
     void generateDigitalSignatureKey();
     void generateKeyManagementKey();
 
 private:
     std::string mCardSerialNumber;
     QLabel *mSerialNumber = nullptr,
            *mVersionLabel = nullptr,
            *mPIVAuthenticationKey = nullptr,
            *mCardAuthenticationKey = nullptr,
            *mDigitalSignatureKey = nullptr,
            *mKeyManagementKey = nullptr;
     QPushButton *mGeneratePIVAuthenticationKeyBtn = nullptr,
                 *mGenerateCardAuthenticationKeyBtn = nullptr,
                 *mGenerateDigitalSignatureKeyBtn = nullptr,
+                *mWriteDigitalSignatureKeyBtn = nullptr,
                 *mGenerateKeyManagementKeyBtn = nullptr;
 };
 } // namespace Kleo
 
 #endif // VIEW_PIVCARDWIDGET_H