Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kleopatra
Commits
c9ef9acb
Commit
c9ef9acb
authored
Nov 26, 2020
by
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
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/smartcard/readerstatus.cpp
View file @
c9ef9acb
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment