diff --git a/tests/ChangeLog b/tests/ChangeLog index aa163695..091986f7 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2003-04-28 Marcus Brinkmann + + * gpg/t-signers.c (print_data): Rewritten. + 2003-04-27 Marcus Brinkmann * gpg/t-encrypt-sign.c (check_result): Rewritten. diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c index d692ac89..94747a8e 100644 --- a/tests/gpg/t-sign.c +++ b/tests/gpg/t-sign.c @@ -125,7 +125,7 @@ main (int argc, char **argv) err = gpgme_new (&ctx); fail_if_err (err); - agent_info = getenv("GPG_AGENT_INFO"); + agent_info = getenv ("GPG_AGENT_INFO"); if (!(agent_info && strchr (agent_info, ':'))) gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL); diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c index d17b3976..145a33e1 100644 --- a/tests/gpg/t-signers.c +++ b/tests/gpg/t-signers.c @@ -1,169 +1,203 @@ /* t-signers.c - Regression tests for the Gpgme multiple signers interface. - * Copyright (C) 2000 Werner Koch (dd9jn) - * Copyright (C) 2001, 2003 g10 Code GmbH - * - * This file is part of GPGME. - * - * GPGME is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * GPGME is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - */ + Copyright (C) 2000 Werner Koch (dd9jn) + Copyright (C) 2001, 2003 g10 Code GmbH + + This file is part of GPGME. + + GPGME is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + GPGME is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GPGME; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include +#include #include -#include #include -#define fail_if_err(a) do { if(a) { \ - fprintf (stderr, "%s:%d: GpgmeError %s\n", \ - __FILE__, __LINE__, gpgme_strerror(a)); \ - exit (1); } \ - } while(0) - -static void -print_op_info (GpgmeCtx ctx) -{ - char *str = gpgme_get_op_info (ctx, 0); - - if (!str) - puts (""); - else - { - puts (str); - free (str); - } -} +#define fail_if_err(err) \ + do \ + { \ + if (err) \ + { \ + fprintf (stderr, "%s:%d: GpgmeError %s\n", \ + __FILE__, __LINE__, gpgme_strerror (err)); \ + exit (1); \ + } \ + } \ + while (0) static void print_data (GpgmeData dh) { - char buf[100]; +#define BUF_SIZE 512 + char buf[BUF_SIZE + 1]; int ret; ret = gpgme_data_seek (dh, 0, SEEK_SET); if (ret) fail_if_err (GPGME_File_Error); - while ((ret = gpgme_data_read (dh, buf, 100)) > 0) + while ((ret = gpgme_data_read (dh, buf, BUF_SIZE)) > 0) fwrite (buf, ret, 1, stdout); if (ret < 0) fail_if_err (GPGME_File_Error); } + static GpgmeError -passphrase_cb (void *opaque, const char *desc, - void **r_hd, const char **result) +passphrase_cb (void *opaque, const char *desc, void **hd, const char **result) { + /* Cleanup by looking at *hd. */ if (!desc) - /* Cleanup by looking at *r_hd. */ return 0; *result = "abc"; - fprintf (stderr, "%% requesting passphrase for `%s': ", desc); - fprintf (stderr, "sending `%s'\n", *result); - return 0; } +static void +check_result (GpgmeSignResult result, GpgmeSigMode type) +{ + GpgmeNewSignature signature; + + if (result->invalid_signers) + { + fprintf (stderr, "Invalid signer found: %s\n", + result->invalid_signers->id); + exit (1); + } + if (!result->signatures || !result->signatures->next + || result->signatures->next->next) + { + fprintf (stderr, "Unexpected number of signatures created\n"); + exit (1); + } + + signature = result->signatures; + while (signature) + { + if (signature->type != type) + { + fprintf (stderr, "Wrong type of signature created\n"); + exit (1); + } + if (signature->pubkey_algo != GPGME_PK_DSA) + { + fprintf (stderr, "Wrong pubkey algorithm reported: %i\n", + signature->pubkey_algo); + exit (1); + } + if (signature->hash_algo != GPGME_MD_SHA1) + { + fprintf (stderr, "Wrong hash algorithm reported: %i\n", + signature->hash_algo); + exit (1); + } + if (signature->class != 1) + { + fprintf (stderr, "Wrong signature class reported: %lu\n", + signature->class); + exit (1); + } + if (strcmp ("A0FF4590BB6122EDEF6E3C542D727CC768697734", + signature->fpr) + && strcmp ("23FD347A419429BACCD5E72D6BC4778054ACD246", + signature->fpr)) + { + fprintf (stderr, "Wrong fingerprint reported: %s\n", + signature->fpr); + exit (1); + } + signature = signature->next; + } +} + + int main (int argc, char *argv[]) { GpgmeCtx ctx; GpgmeError err; GpgmeData in, out; - GpgmeKey key[2]; /* There are two secret keys in the test area. */ - char *p; + GpgmeKey key[2]; + GpgmeSignResult result; + char *agent_info; err = gpgme_new (&ctx); fail_if_err (err); + + agent_info = getenv("GPG_AGENT_INFO"); + if (!(agent_info && strchr (agent_info, ':'))) + gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL); + + gpgme_set_textmode (ctx, 1); + gpgme_set_armor (ctx, 1); + err = gpgme_op_keylist_start (ctx, NULL, 1); fail_if_err (err); err = gpgme_op_keylist_next (ctx, &key[0]); fail_if_err (err); err = gpgme_op_keylist_next (ctx, &key[1]); fail_if_err (err); - gpgme_release (ctx); + err = gpgme_op_keylist_end (ctx); + fail_if_err (err); + + err = gpgme_signers_add (ctx, key[0]); + fail_if_err (err); + err = gpgme_signers_add (ctx, key[1]); + fail_if_err (err); + + err = gpgme_data_new_from_mem (&in, "Hallo Leute\n", 12, 0); + fail_if_err (err); + + /* First a normal signature. */ + err = gpgme_data_new (&out); + fail_if_err (err); + err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_NORMAL); + fail_if_err (err); + result = gpgme_op_sign_result (ctx); + check_result (result, GPGME_SIG_MODE_NORMAL); + print_data (out); + gpgme_data_release (out); - do - { - err = gpgme_new (&ctx); - fail_if_err (err); - - p = getenv("GPG_AGENT_INFO"); - if (!(p && strchr (p, ':'))) - gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL); - err = gpgme_signers_add (ctx, key[0]); - fail_if_err (err); - err = gpgme_signers_add (ctx, key[1]); - fail_if_err (err); - - gpgme_set_textmode (ctx, 1); - gpgme_set_armor (ctx, 1); - - err = gpgme_data_new_from_mem (&in, "Hallo Leute\n", 12, 0); - fail_if_err (err); - - - /* First a normal signature. */ - err = gpgme_data_new (&out); - fail_if_err (err); - err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_NORMAL); - fail_if_err (err); - fflush (NULL); - fputs ("Begin Result:\n", stdout); - print_op_info (ctx); - print_data (out); - fputs ("End Result.\n", stdout); - gpgme_data_release (out); - gpgme_data_rewind (in); + /* Now a detached signature. */ + gpgme_data_rewind (in); + err = gpgme_data_new (&out); + fail_if_err (err); + err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_DETACH); + fail_if_err (err); + result = gpgme_op_sign_result (ctx); + check_result (result, GPGME_SIG_MODE_DETACH); + print_data (out); + gpgme_data_release (out); - /* Now a detached signature. */ - err = gpgme_data_new (&out); - fail_if_err (err); - err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_DETACH); - fail_if_err (err); - fflush (NULL); - print_op_info (ctx); - fputs ("Begin Result:\n", stdout); - print_data (out); - fputs ("End Result.\n", stdout); - gpgme_data_release (out); - gpgme_data_rewind (in); - - /* And finally a cleartext signature. */ - err = gpgme_data_new (&out); - fail_if_err (err); - err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_CLEAR); - fail_if_err (err); - fflush (NULL); - print_op_info (ctx); - fputs ("Begin Result:\n", stdout); - print_data (out); - fputs ("End Result.\n", stdout); - gpgme_data_release (out); - gpgme_data_rewind (in); - - /* Ready. */ - gpgme_data_release (in); - gpgme_release (ctx); - } - while (argc > 1 && !strcmp (argv[1], "--loop")); + /* And finally a cleartext signature. */ + gpgme_data_rewind (in); + err = gpgme_data_new (&out); + fail_if_err (err); + err = gpgme_op_sign (ctx, in, out, GPGME_SIG_MODE_CLEAR); + fail_if_err (err); + result = gpgme_op_sign_result (ctx); + check_result (result, GPGME_SIG_MODE_CLEAR); + print_data (out); + gpgme_data_release (out); + gpgme_data_rewind (in); + + gpgme_data_release (in); + gpgme_release (ctx); gpgme_key_release (key[0]); gpgme_key_release (key[1]); - return 0; }