diff options
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/ChangeLog | 7 | ||||
| -rw-r--r-- | sm/export.c | 4 | ||||
| -rw-r--r-- | sm/gpgsm.c | 4 | ||||
| -rw-r--r-- | sm/import.c | 6 | ||||
| -rw-r--r-- | sm/keylist.c | 4 | ||||
| -rw-r--r-- | sm/sign.c | 6 | ||||
| -rw-r--r-- | sm/verify.c | 18 |
7 files changed, 33 insertions, 16 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog index 24a95b103..e0ba197d9 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,10 @@ +2003-06-04 Werner Koch <[email protected]> + + * call-agent.c (init_membuf,put_membuf,get_membuf): Removed. + Include new membuf header and changed used type. + + Renamed error codes from INVALID to INV and removed _ERROR suffixes. + 2003-06-03 Werner Koch <[email protected]> Changed all error codes in all files to the new libgpg-error scheme. diff --git a/sm/export.c b/sm/export.c index 1e279a564..d4b05816f 100644 --- a/sm/export.c +++ b/sm/export.c @@ -165,7 +165,7 @@ gpgsm_export (CTRL ctrl, STRLIST names, FILE *fp) rc = gpgsm_finish_writer (b64writer); if (rc) { - log_error ("write failed: %s\n", gnupg_strerror (rc)); + log_error ("write failed: %s\n", gpg_strerror (rc)); goto leave; } gpgsm_destroy_writer (b64writer); @@ -182,7 +182,7 @@ gpgsm_export (CTRL ctrl, STRLIST names, FILE *fp) rc = gpgsm_finish_writer (b64writer); if (rc) { - log_error ("write failed: %s\n", gnupg_strerror (rc)); + log_error ("write failed: %s\n", gpg_strerror (rc)); goto leave; } } diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 8fefe609c..8aebb1c1d 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1290,7 +1290,7 @@ main ( int argc, char **argv) { int rc = gpgsm_agent_learn (); if (rc) - log_error ("error learning card: %s\n", gnupg_strerror (rc)); + log_error ("error learning card: %s\n", gpg_strerror (rc)); } break; @@ -1311,7 +1311,7 @@ main ( int argc, char **argv) else rc = gpgsm_agent_passwd (grip); if (rc) - log_error ("error changing passphrase: %s\n", gnupg_strerror (rc)); + log_error ("error changing passphrase: %s\n", gpg_strerror (rc)); xfree (grip); ksba_cert_release (cert); } diff --git a/sm/import.c b/sm/import.c index b3aaa823f..12788ea46 100644 --- a/sm/import.c +++ b/sm/import.c @@ -211,7 +211,7 @@ import_one (CTRL ctrl, struct stats_s *stats, int in_fd) rc = gpgsm_create_reader (&b64reader, ctrl, fp, &reader); if (rc) { - log_error ("can't create reader: %s\n", gnupg_strerror (rc)); + log_error ("can't create reader: %s\n", gpg_strerror (rc)); goto leave; } @@ -310,7 +310,7 @@ gpgsm_import (CTRL ctrl, int in_fd) line invocation will return with an error (log_error keeps a global errorcount) */ if (rc && !log_get_errorcount (0)) - log_error (_("error importing certificate: %s\n"), gnupg_strerror (rc)); + log_error (_("error importing certificate: %s\n"), gpg_strerror (rc)); return rc; } @@ -342,7 +342,7 @@ gpgsm_import_files (CTRL ctrl, int nfiles, char **files, line invocation will return with an error (log_error keeps a global errorcount) */ if (rc && !log_get_errorcount (0)) - log_error (_("error importing certificate: %s\n"), gnupg_strerror (rc)); + log_error (_("error importing certificate: %s\n"), gpg_strerror (rc)); return rc; } diff --git a/sm/keylist.c b/sm/keylist.c index 96a8469ba..46a4e3806 100644 --- a/sm/keylist.c +++ b/sm/keylist.c @@ -485,7 +485,7 @@ list_internal_keys (CTRL ctrl, STRLIST names, FILE *fp, unsigned int mode) rc = keydb_get_cert (hd, &cert); if (rc) { - log_error ("keydb_get_cert failed: %s\n", gnupg_strerror (rc)); + log_error ("keydb_get_cert failed: %s\n", gpg_strerror (rc)); goto leave; } @@ -593,7 +593,7 @@ list_external_keys (CTRL ctrl, STRLIST names, FILE *fp) rc = gpgsm_dirmngr_lookup (ctrl, names, list_external_cb, &parm); if (rc) - log_error ("listing external keys failed: %s\n", gnupg_strerror (rc)); + log_error ("listing external keys failed: %s\n", gpg_strerror (rc)); } /* List all keys or just the key given as NAMES. @@ -148,7 +148,7 @@ gpgsm_get_default_cert (KsbaCert *r_cert) rc = keydb_get_cert (hd, &cert); if (rc) { - log_error ("keydb_get_cert failed: %s\n", gnupg_strerror (rc)); + log_error ("keydb_get_cert failed: %s\n", gpg_strerror (rc)); keydb_release (hd); return rc; } @@ -171,7 +171,7 @@ gpgsm_get_default_cert (KsbaCert *r_cert) } while (!(rc = keydb_search_next (hd))); if (rc && rc != -1) - log_error ("keydb_search_next failed: %s\n", gnupg_strerror (rc)); + log_error ("keydb_search_next failed: %s\n", gpg_strerror (rc)); ksba_cert_release (cert); keydb_release (hd); @@ -194,7 +194,7 @@ get_default_signer (void) { if (rc != -1) log_debug ("failed to find default certificate: %s\n", - gnupg_strerror (rc)); + gpg_strerror (rc)); return NULL; } return cert; diff --git a/sm/verify.c b/sm/verify.c index 412f722d7..569af8b84 100644 --- a/sm/verify.c +++ b/sm/verify.c @@ -365,8 +365,13 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd, FILE *out_fp) else log_error ("failed to find the certificate: %s\n", gnupg_strerror(rc)); - gpgsm_status2 (ctrl, STATUS_ERROR, "verify.findkey", - gnupg_error_token (rc), NULL); + { + char numbuf[50]; + sprintf (numbuf, "%d", rc); + + gpgsm_status2 (ctrl, STATUS_ERROR, "verify.findkey", + numbuf, NULL); + } /* fixme: we might want to append the issuer and serial using our standard notation */ goto next_signer; @@ -533,8 +538,13 @@ gpgsm_verify (CTRL ctrl, int in_fd, int data_fd, FILE *out_fp) fclose (fp); if (rc) - gpgsm_status2 (ctrl, STATUS_ERROR, "verify.leave", - gnupg_error_token (rc), NULL); + { + char numbuf[50]; + sprintf (numbuf, "%d", rc ); + gpgsm_status2 (ctrl, STATUS_ERROR, "verify.leave", + numbuf, NULL); + } + return rc; } |