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
38eb236a
Commit
38eb236a
authored
Nov 17, 2020
by
Ingo Klöcker
Browse files
Merge remote-tracking branch 'origin/release/20.12'
parents
681bed80
787568c7
Pipeline
#41339
failed with stage
in 10 minutes and 18 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/commands/authenticatepivcardapplicationcommand.cpp
View file @
38eb236a
...
...
@@ -20,6 +20,11 @@
#include
<gpgme++/error.h>
#include
<gpg-error.h>
#if GPG_ERROR_VERSION_NUMBER >= 0x12400 // 1.36
# define GPG_ERROR_HAS_BAD_AUTH
#endif
#include
"kleopatra_debug.h"
using
namespace
Kleo
;
...
...
@@ -136,10 +141,12 @@ void AuthenticatePIVCardApplicationCommand::Private::slotResult(const Error &err
return
;
}
if
(
err
)
{
#ifdef GPG_ERROR_HAS_BAD_AUTH
if
(
err
.
code
()
==
GPG_ERR_BAD_AUTH
)
{
retryAskingForKey
();
return
;
}
#endif
error
(
i18nc
(
"@info"
,
"Authenticating to the card failed: %1"
,
QString
::
fromLatin1
(
err
.
asString
())),
i18nc
(
"@title"
,
"Error"
));
}
...
...
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