diff options
Diffstat (limited to '')
| -rw-r--r-- | sm/ChangeLog | 6 | ||||
| -rw-r--r-- | sm/gpgsm.c | 2 | ||||
| -rw-r--r-- | sm/import.c | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 36bbbb335..a5112a190 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,9 @@ +2002-06-26 Werner Koch <[email protected]> + + * import.c (gpgsm_import): Print an STATUS_IMPORTED. + + * gpgsm.c: --debug-no-path-validation does not take an argument. + 2002-06-25 Werner Koch <[email protected]> * certdump.c (print_dn_part): Always print a leading slash, diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 0754d3a57..e650e941c 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -302,7 +302,7 @@ static ARGPARSE_OPTS opts[] = { { oDebug, "debug" ,4|16, "@"}, { oDebugAll, "debug-all" ,0, "@"}, { oDebugWait, "debug-wait" ,1, "@"}, - { oDebugNoPathValidation, "debug-no-path-validation" ,1, "@"}, + { oDebugNoPathValidation, "debug-no-path-validation" ,0, "@"}, { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") }, { aDummy, "no-comment", 0, "@"}, { aDummy, "completes-needed", 1, "@"}, diff --git a/sm/import.c b/sm/import.c index 1258d308b..4f77b7f1f 100644 --- a/sm/import.c +++ b/sm/import.c @@ -106,6 +106,10 @@ gpgsm_import (CTRL ctrl, int in_fd) { if (!keydb_store_cert (cert, 0)) { + char *fpr; + fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1); + gpgsm_status2 (ctrl, STATUS_IMPORTED, fpr, " [X.509]", NULL); + xfree (fpr); if (opt.verbose) log_info ("certificate imported\n"); } @@ -141,6 +145,10 @@ gpgsm_import (CTRL ctrl, int in_fd) { if (!keydb_store_cert (cert, 0)) { + char *fpr; + fpr = gpgsm_get_fingerprint_hexstring (cert, GCRY_MD_SHA1); + gpgsm_status2 (ctrl, STATUS_IMPORTED, fpr, " [X.509]", NULL); + xfree (fpr); if (opt.verbose) log_info ("certificate imported\n"); } @@ -156,7 +164,6 @@ gpgsm_import (CTRL ctrl, int in_fd) rc = GNUPG_No_Data; } - leave: ksba_cms_release (cms); ksba_cert_release (cert); |