security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

* import.c (gpgsm_import): Print an STATUS_IMPORTED. 

* gpgsm.c: --debug-no-path-validation does not take an argument.
This commit is contained in:
Werner Koch 2002-06-26 12:51:34 +00:00
parent d905375003
commit 738e6d8212
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sm/ChangeLog
View File

@ -1,3 +1,9 @@
2002-06-26 Werner Koch <wk@gnupg.org>
* import.c (gpgsm_import): Print an STATUS_IMPORTED.
* gpgsm.c: --debug-no-path-validation does not take an argument.
2002-06-25 Werner Koch <wk@gnupg.org>
* certdump.c (print_dn_part): Always print a leading slash,

2
sm/gpgsm.c
View File

@ -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, "@"},

9
sm/import.c
View File

@ -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);