diff options
| author | Werner Koch <wk@gnupg.org> | 2017-10-27 13:56:15 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-10-27 13:56:15 +0200 |
| commit | f6ab97fd9620bb8f512ffb471a66e5f96098a7cc (patch) | |
| tree | 99db33d56ef4f0c05f1d6af6ec7ffaffd9547e1b /g10/keygen.c | |
| parent | agent: Clean up pinentry access locking. (diff) | |
| parent | agent, tests: Support --disable-scdaemon build case. (diff) | |
| download | gnupg2-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.tar.xz gnupg2-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
configure.ac - Adjust due to new log_clock otions
Diffstat (limited to 'g10/keygen.c')
| -rw-r--r-- | g10/keygen.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index e959ee901..1dddfeeda 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -5050,6 +5050,9 @@ generate_subkeypair (ctrl_t ctrl, kbnode_t keyblock, const char *algostr, err = agent_passwd (ctrl, hexgrip, desc, 1 /*=verify*/, &cache_nonce, &passwd_nonce); xfree (desc); + if (gpg_err_code (err) == GPG_ERR_NOT_IMPLEMENTED + && gpg_err_source (err) == GPG_ERR_SOURCE_GPGAGENT) + err = 0; /* Very likely that the key is on a card. */ if (err) goto leave; } |