diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 4 | ||||
| -rw-r--r-- | scd/app-p15.c | 4 | ||||
| -rw-r--r-- | scd/scdaemon.c | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index d584495c3..df9e75a4f 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,7 @@ +2006-10-23 Werner Koch <[email protected]> + + * scdaemon.c (main): New command --gpgconf-test. + 2006-10-17 Werner Koch <[email protected]> * Makefile.am (scdaemon_LDADD): Link against libcommonpth. diff --git a/scd/app-p15.c b/scd/app-p15.c index 8e786dd97..f6b3eff4d 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -2712,7 +2712,7 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name) general rule for it so we need to decide case by case. */ if (app->app_local->card_type == CARD_TYPE_BELPIC) { - /* The eID card has a card number printed on the fron matter + /* The eID card has a card number printed on the front matter which seems to be a good indication. */ unsigned char *buffer; const unsigned char *p; @@ -2938,7 +2938,7 @@ do_sign (app_t app, const char *keyidstr, int hashalgo, /* Due to the fact that the non-repudiation signature on a BELPIC - card requires a ver verify immediately before the DSO we set the + card requires a verify immediately before the DSO we set the MSE before we do the verification. Other cards might allow to do this also but I don't want to break anything, thus we do it only for the BELPIC card here. */ diff --git a/scd/scdaemon.c b/scd/scdaemon.c index c962f3f77..0ee3f4bc6 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -63,6 +63,7 @@ enum cmd_and_opt_values oNoVerbose = 500, aGPGConfList, + aGPGConfTest, oOptions, oDebug, oDebugAll, @@ -97,6 +98,7 @@ enum cmd_and_opt_values static ARGPARSE_OPTS opts[] = { { aGPGConfList, "gpgconf-list", 256, "@" }, + { aGPGConfTest, "gpgconf-test", 256, "@" }, { 301, NULL, 0, N_("@Options:\n ") }, @@ -450,6 +452,7 @@ main (int argc, char **argv ) switch (pargs.r_opt) { case aGPGConfList: gpgconf_list = 1; break; + case aGPGConfTest: gpgconf_list = 2; break; case oQuiet: opt.quiet = 1; break; case oVerbose: opt.verbose++; break; case oBatch: opt.batch=1; break; @@ -552,6 +555,8 @@ main (int argc, char **argv ) log_debug ("... okay\n"); } + if (gpgconf_list == 2) + scd_exit (0); if (gpgconf_list) { /* List options and default values in the GPG Conf format. */ |