From a8fe22ca6ba1ef72e603611b6b72b65a701e1575 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 6 Jun 2003 00:56:03 +0000 Subject: doc/ 2003-06-06 Marcus Brinkmann * gpgme.texi (Crypto Operations): Rename gpgme_invalid_user_id_t to gpgme_invalid_key_t. gpgme/ 2003-06-06 Marcus Brinkmann * op-support.c (_gpgme_parse_inv_userid): Rename to _gpgme_parse_inv_recp and change to new datatype. * ops.h (_gpgme_parse_inv_key): Fix prototype. * gpgme.h (struct _gpgme_invalid_user_id): Rename to __gpgme_invalid_key. Rename field ID to KEY. (gpgme_invalid_user_id_t): Rename to gpgme_invalid_key_t. (struct _gpgme_op_encrypt_result): Here, too. (struct _gpgme_op_sign_result): Likewise. * encrypt.c (struct op_data): Likewise. (release_op_data): Likewise. * sign.c (struct op_data): Likewise. (release_op_data): Likewise. --- tests/gpg/t-encrypt-sign.c | 4 ++-- tests/gpg/t-encrypt.c | 2 +- tests/gpg/t-sign.c | 2 +- tests/gpg/t-signers.c | 2 +- tests/gpg/t-support.h | 4 ++-- tests/gpgsm/t-encrypt.c | 2 +- tests/gpgsm/t-sign.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c index fc99d56c..96aebda0 100644 --- a/tests/gpg/t-encrypt-sign.c +++ b/tests/gpg/t-encrypt-sign.c @@ -34,7 +34,7 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type) if (result->invalid_signers) { fprintf (stderr, "Invalid signer found: %s\n", - result->invalid_signers->id); + result->invalid_signers->fpr); exit (1); } if (!result->signatures || result->signatures->next) @@ -117,7 +117,7 @@ main (int argc, char **argv) if (result->invalid_recipients) { fprintf (stderr, "Invalid recipient encountered: %s\n", - result->invalid_recipients->id); + result->invalid_recipients->fpr); exit (1); } sign_result = gpgme_op_sign_result (ctx); diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c index bebd9938..11ebf3f4 100644 --- a/tests/gpg/t-encrypt.c +++ b/tests/gpg/t-encrypt.c @@ -64,7 +64,7 @@ main (int argc, char *argv[]) if (result->invalid_recipients) { fprintf (stderr, "Invalid recipient encountered: %s\n", - result->invalid_recipients->id); + result->invalid_recipients->fpr); exit (1); } print_data (out); diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c index ff40e7cd..85b94a7e 100644 --- a/tests/gpg/t-sign.c +++ b/tests/gpg/t-sign.c @@ -34,7 +34,7 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type) if (result->invalid_signers) { fprintf (stderr, "Invalid signer found: %s\n", - result->invalid_signers->id); + result->invalid_signers->fpr); exit (1); } if (!result->signatures || result->signatures->next) diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c index 12b0b083..1f2e48f9 100644 --- a/tests/gpg/t-signers.c +++ b/tests/gpg/t-signers.c @@ -36,7 +36,7 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type) if (result->invalid_signers) { fprintf (stderr, "Invalid signer found: %s\n", - result->invalid_signers->id); + result->invalid_signers->fpr); exit (1); } if (!result->signatures || !result->signatures->next diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h index 8f91838d..e9ea283d 100644 --- a/tests/gpg/t-support.h +++ b/tests/gpg/t-support.h @@ -46,11 +46,11 @@ print_data (gpgme_data_t dh) ret = gpgme_data_seek (dh, 0, SEEK_SET); if (ret) - fail_if_err (gpgme_error_from_errno (errno)); + fail_if_err (gpgme_err_code_from_errno (errno)); while ((ret = gpgme_data_read (dh, buf, BUF_SIZE)) > 0) fwrite (buf, ret, 1, stdout); if (ret < 0) - fail_if_err (gpgme_error_from_errno (errno)); + fail_if_err (gpgme_err_code_from_errno (errno)); } diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c index 247f1ca9..4da0f727 100644 --- a/tests/gpgsm/t-encrypt.c +++ b/tests/gpgsm/t-encrypt.c @@ -59,7 +59,7 @@ main (int argc, char **argv) if (result->invalid_recipients) { fprintf (stderr, "Invalid recipient encountered: %s\n", - result->invalid_recipients->id); + result->invalid_recipients->fpr); exit (1); } print_data (out); diff --git a/tests/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c index fbd72f1a..d346b9e3 100644 --- a/tests/gpgsm/t-sign.c +++ b/tests/gpgsm/t-sign.c @@ -32,7 +32,7 @@ check_result (gpgme_sign_result_t result, gpgme_sig_mode_t type) if (result->invalid_signers) { fprintf (stderr, "Invalid signer found: %s\n", - result->invalid_signers->id); + result->invalid_signers->fpr); exit (1); } if (!result->signatures || result->signatures->next) -- cgit v1.2.3