Commit c9ef9acb authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Remove workaround for nice serial number of Yubikeys

GnuPG-bug-id: 5100
parent 81b9ea4a
Pipeline #42109 passed with stage
in 17 minutes and 9 seconds
......@@ -394,13 +394,6 @@ static void setDisplaySerialNumber(Card *card, std::shared_ptr<Context> &gpgAgen
Error err;
const QString displaySerialNumber = QString::fromStdString(getDisplaySerialNumber(gpgAgent, err));
if (card->cardType() == "yubikey" && isOpenPGPCardSerialNumber(card->serialNumber())
&& !displaySerialNumber.startsWith(QLatin1String("yk-"))) {
// workaround for special Yubikey serial number being overwritten by OpenPGP card serial number (https://dev.gnupg.org/T5100)
card->setDisplaySerialNumber(
QLatin1String("yk-") + QString::fromStdString(card->serialNumber().substr(20, 8)).replace(leadingZeros, QString()));
return;
}
if (err) {
card->setDisplaySerialNumber(QString::fromStdString(card->serialNumber()));
return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment