summaryrefslogtreecommitdiffstats
path: root/sm/server.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-02-17 16:05:04 +0100
committerWerner Koch <wk@gnupg.org>2004-02-17 16:05:04 +0100
commit45a817bf4a6f7624d49cd61247b7efeb3b7ad726 (patch)
treefc19cfea9fba63e9e8455fb9f8ad2ff8d8bf6fa0 /sm/server.c
parentAdded new options (diff)
downloadgnupg2-45a817bf4a6f7624d49cd61247b7efeb3b7ad726.tar.xz
gnupg2-45a817bf4a6f7624d49cd61247b7efeb3b7ad726.zip
* 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.
Diffstat (limited to 'sm/server.c')
-rw-r--r--sm/server.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sm/server.c b/sm/server.c
index 549c35350..54b220d14 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -170,6 +170,10 @@ option_handler (ASSUAN_CONTEXT ctx, const char *key, const char *value)
else
return ASSUAN_Parameter_Error;
}
+ else if (!strcmp (key, "with-validation"))
+ {
+ ctrl->with_validation = !!*value;
+ }
else
return ASSUAN_Invalid_Option;
@@ -898,6 +902,7 @@ get_status_string ( int no )
case STATUS_BADMDC : s = "BADMDC"; break;
case STATUS_ERRMDC : s = "ERRMDC"; break;
case STATUS_IMPORTED : s = "IMPORTED"; break;
+ case STATUS_IMPORT_OK : s = "IMPORT_OK"; break;
case STATUS_IMPORT_RES : s = "IMPORT_RES"; break;
case STATUS_FILE_START : s = "FILE_START"; break;
case STATUS_FILE_DONE : s = "FILE_DONE"; break;