* gpgsm.c: New option --with-md5-fingerprint.

* keylist.c (list_cert_std): Print MD5 fpr.

* gpgsm.c: New options --with-validation.
* server.c (option_handler): New option "with-validation".
* keylist.c (list_cert_std, list_internal_keys): New args CTRL and
WITH_VALIDATION. Changed callers to set it.
(list_external_cb, list_external_keys): Pass CTRL to the callback.
(list_cert_colon): Add arg CTRL.  Check validation if requested.
* certchain.c (unknown_criticals, allowed_ca, check_cert_policy)
(gpgsm_validate_chain): New args LISTMODE and FP.
(do_list): New helper for info output.
(find_up): New arg FIND_NEXT.
(gpgsm_validate_chain): After a bad signature try again with other
CA certificates.

* import.c (print_imported_status): New arg NEW_CERT. Print
additional STATUS_IMPORT_OK becuase that is what gpgme expects.
(check_and_store): Always call above function after import.
* server.c (get_status_string): Added STATUS_IMPORT_OK.

1 files changed, 12 insertions, 7 deletions

diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index eb40b1c49..49a73186d 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -58,9 +58,12 @@ struct {
   char *outfile;    /* name of output file */
 
   int with_key_data;/* include raw key in the column delimted output */
-
+  
   int fingerprint;  /* list fingerprints in all key listings */
 
+  int with_md5_fingerprint; /* Also print an MD5 fingerprint for
+                               standard key listings. */
+
   int armor;        /* force base64 armoring (see also ctrl.with_base64) */
   int no_armor;     /* don't try to figure out whether data is base64 armored*/
 
@@ -117,13 +120,14 @@ struct server_local_s;
 /* Note that the default values for this are set by
    gpgsm_init_default_ctrl() */
 struct server_control_s {
-  int no_server;     /* we are not running under server control */
-  int  status_fd;    /* only for non-server mode */
+  int no_server;      /* We are not running under server control */
+  int  status_fd;     /* Only for non-server mode */
   struct server_local_s *server_local;
-  int with_colons;  /* use column delimited output format */
-  int with_chain;   /* include the certifying certs in a listing */
+  int with_colons;    /* Use column delimited output format */
+  int with_chain;     /* Include the certifying certs in a listing */
+  int with_validation;/* Validate each key while listing. */
 
-  int autodetect_encoding; /* try to detect the input encoding */
+  int autodetect_encoding; /* Try to detect the input encoding */
   int is_pem;         /* Is in PEM format */
   int is_base64;      /* is in plain base-64 format */
 
@@ -216,7 +220,8 @@ int gpgsm_create_cms_signature (ksba_cert_t cert, gcry_md_hd_t md, int mdalgo,
 int gpgsm_walk_cert_chain (ksba_cert_t start, ksba_cert_t *r_next);
 int gpgsm_is_root_cert (ksba_cert_t cert);
 int gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert,
-                          ksba_isotime_t r_exptime);
+                          ksba_isotime_t r_exptime,
+                          int listmode, FILE *listfp);
 int gpgsm_basic_cert_check (ksba_cert_t cert);
 
 /*-- certlist.c --*/