mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Exporting secret keys via gpg-agent is now basically supported.
A couple of forward ported changes. Doc updates.
This commit is contained in:
parent
aeb31977ec
commit
bfbd80feb9
72 changed files with 1930 additions and 546 deletions
14
sm/import.c
14
sm/import.c
|
@ -194,7 +194,8 @@ check_and_store (ctrl_t ctrl, struct stats_s *stats,
|
|||
if (!rc && ctrl->with_validation)
|
||||
rc = gpgsm_validate_chain (ctrl, cert, "", NULL, 0, NULL, 0, NULL);
|
||||
if (!rc || (!ctrl->with_validation
|
||||
&& gpg_err_code (rc) == GPG_ERR_MISSING_CERT) )
|
||||
&& (gpg_err_code (rc) == GPG_ERR_MISSING_CERT
|
||||
|| gpg_err_code (rc) == GPG_ERR_MISSING_ISSUER_CERT)))
|
||||
{
|
||||
int existed;
|
||||
|
||||
|
@ -253,9 +254,14 @@ check_and_store (ctrl_t ctrl, struct stats_s *stats,
|
|||
log_error (_("basic certificate checks failed - not imported\n"));
|
||||
if (stats)
|
||||
stats->not_imported++;
|
||||
print_import_problem (ctrl, cert,
|
||||
gpg_err_code (rc) == GPG_ERR_MISSING_CERT? 2 :
|
||||
gpg_err_code (rc) == GPG_ERR_BAD_CERT? 1 : 0);
|
||||
/* We keep the test for GPG_ERR_MISSING_CERT only in case
|
||||
GPG_ERR_MISSING_CERT has been used instead of the newer
|
||||
GPG_ERR_MISSING_ISSUER_CERT. */
|
||||
print_import_problem
|
||||
(ctrl, cert,
|
||||
gpg_err_code (rc) == GPG_ERR_MISSING_ISSUER_CERT? 2 :
|
||||
gpg_err_code (rc) == GPG_ERR_MISSING_CERT? 2 :
|
||||
gpg_err_code (rc) == GPG_ERR_BAD_CERT? 1 : 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue