diff options
Diffstat (limited to '')
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/gpg/t-encrypt.c | 128 | ||||
| -rw-r--r-- | tests/gpg/t-genkey.c | 2 | ||||
| -rw-r--r-- | tests/gpg/t-sign.c | 251 | ||||
| -rw-r--r-- | tests/gpgsm/t-encrypt.c | 141 | ||||
| -rw-r--r-- | tests/gpgsm/t-genkey.c | 41 | ||||
| -rw-r--r-- | tests/gpgsm/t-sign.c | 211 | 
7 files changed, 392 insertions, 387 deletions
| diff --git a/tests/ChangeLog b/tests/ChangeLog index 357c12ff..d0600d00 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,10 @@  2003-04-27  Marcus Brinkmann  <[email protected]> +	* gpg/t-sign.c: Rewritten. +	* gpgsm/t-sign.c: Rewritten. +	* gpg/t-encrypt.c: Check for invalid recipients. +	* gpgsm/t-encrypt.c: Likewise. +  	* gpg/t-import.c (check_result): Really use FPR.  	* gpgsm/t-import.c (check_result): Rewritten. diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c index fa55fd6f..d5359b9a 100644 --- a/tests/gpg/t-encrypt.c +++ b/tests/gpg/t-encrypt.c @@ -1,4 +1,4 @@ -/* t-encrypt.c  - regression test +/* t-encrypt.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn)     Copyright (C) 2001, 2002, 2003 g10 Code GmbH @@ -18,99 +18,89 @@     along with GPGME; if not, write to the Free Software Foundation,     Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ -#include <stdio.h>  #include <stdlib.h> +#include <stdio.h>  #include <string.h> -#include <assert.h>  #include <gpgme.h> -#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 c) -{ -  char *s = gpgme_get_op_info (c, 0); - -  if (!s) -    puts ("<!-- no operation info available -->"); -  else -    { -      puts (s); -      free (s); -    } -} +#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);  } -  int   main (int argc, char **argv)  { -    GpgmeCtx ctx; -    GpgmeError err; -    GpgmeData in, out; -    GpgmeRecipients rset; - -    err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); -    fail_if_err (err); - -  do { -    err = gpgme_new (&ctx); -    fail_if_err (err); -    gpgme_set_armor (ctx, 1); - -    err = gpgme_data_new_from_mem ( &in, "Hallo Leute\n", 12, 0 ); -    fail_if_err (err); - -    err = gpgme_data_new ( &out ); -    fail_if_err (err); - -    err = gpgme_recipients_new (&rset); -    fail_if_err (err); -    err = gpgme_recipients_add_name_with_validity (rset, "Bob", -                                                   GPGME_VALIDITY_FULL); -    fail_if_err (err); -    err = gpgme_recipients_add_name_with_validity (rset, "Alpha", -                                                   GPGME_VALIDITY_FULL); -    fail_if_err (err); - - -    err = gpgme_op_encrypt (ctx, rset, in, out ); -    print_op_info (ctx); -    fail_if_err (err); +  GpgmeCtx ctx; +  GpgmeError err; +  GpgmeData in, out; +  GpgmeRecipients rset; +  GpgmeEncryptResult result; + +  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP); +  fail_if_err (err); +     +  err = gpgme_new (&ctx); +  fail_if_err (err); +  gpgme_set_armor (ctx, 1); + +  err = gpgme_data_new_from_mem (&in, "Hallo Leute\n", 12, 0); +  fail_if_err (err); + +  err = gpgme_data_new (&out); +  fail_if_err (err); +     +  err = gpgme_recipients_new (&rset); +  fail_if_err (err); +  err = gpgme_recipients_add_name_with_validity (rset, "Bob", +						 GPGME_VALIDITY_FULL); +  fail_if_err (err); +  err = gpgme_recipients_add_name_with_validity (rset, "Alpha", +						 GPGME_VALIDITY_FULL); +  fail_if_err (err); + +  err = gpgme_op_encrypt (ctx, rset, in, out); +  fail_if_err (err); +  result = gpgme_op_encrypt_result (ctx); +  if (result->invalid_recipients) +    { +      fprintf (stderr, "Invalid recipient encountered: %s\n", +	       result->invalid_recipients->id); +      exit (1); +    } +  print_data (out); -    fflush (NULL); -    fputs ("Begin Result:\n", stdout ); -    print_data (out); -    fputs ("End Result.\n", stdout ); -    -    gpgme_recipients_release (rset); -    gpgme_data_release (in); -    gpgme_data_release (out); -    gpgme_release (ctx); -  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) ); -    -    return 0; +  gpgme_recipients_release (rset); +  gpgme_data_release (in); +  gpgme_data_release (out); +  gpgme_release (ctx); +  return 0;  } diff --git a/tests/gpg/t-genkey.c b/tests/gpg/t-genkey.c index 3a56b394..3e13f02a 100644 --- a/tests/gpg/t-genkey.c +++ b/tests/gpg/t-genkey.c @@ -1,4 +1,4 @@ -/* t-genkey.c  - regression test +/* t-genkey.c - regression test     Copyright (C) 2000 Werner Koch (dd9jn)     Copyright (C) 2001, 2003 g10 Code GmbH diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c index 1e69930b..d692ac89 100644 --- a/tests/gpg/t-sign.c +++ b/tests/gpg/t-sign.c @@ -1,62 +1,53 @@ -/* t-sign.c  - regression test - *	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 - */ +/* t-sign.c - Regression test. +   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 <stdio.h>  #include <stdlib.h> +#include <stdio.h>  #include <string.h> -#include <assert.h>  #include <gpgme.h> -#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 ("<!-- no operation info available -->"); -  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); @@ -64,89 +55,121 @@ print_data (GpgmeData dh)  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;  } -int  -main (int argc, char **argv ) +static void +check_result (GpgmeSignResult result, GpgmeSigMode type)  { -    GpgmeCtx ctx; -    GpgmeError err; -    GpgmeData in, out; -    char *p; - -  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 ); - -    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 */ -    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); -     +  if (result->invalid_signers) +    { +      fprintf (stderr, "Invalid signer found: %s\n", +	       result->invalid_signers->id); +      exit (1); +    } +  if (!result->signatures || result->signatures->next) +    { +      fprintf (stderr, "Unexpected number of signatures created\n"); +      exit (1); +    } +  if (result->signatures->type != type) +    { +      fprintf (stderr, "Wrong type of signature created\n"); +      exit (1); +    } +  if (result->signatures->pubkey_algo != GPGME_PK_DSA) +    { +      fprintf (stderr, "Wrong pubkey algorithm reported: %i\n", +	       result->signatures->pubkey_algo); +      exit (1); +    } +  if (result->signatures->hash_algo != GPGME_MD_SHA1) +    { +      fprintf (stderr, "Wrong hash algorithm reported: %i\n", +	       result->signatures->hash_algo); +      exit (1); +    } +  if (result->signatures->class != 1) +    { +      fprintf (stderr, "Wrong signature class reported: %lu\n", +	       result->signatures->class); +      exit (1); +    } +  if (strcmp ("A0FF4590BB6122EDEF6E3C542D727CC768697734", +	      result->signatures->fpr)) +    { +      fprintf (stderr, "Wrong fingerprint reported: %s\n", +	       result->signatures->fpr); +      exit (1); +    } +} + -    /* 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); +int  +main (int argc, char **argv) +{ +  GpgmeCtx ctx; +  GpgmeError err; +  GpgmeData in, out; +  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_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); -    /* ready */ -    gpgme_data_release (in); -    gpgme_release (ctx); -  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) ); -    -    return 0; +  /* 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); + +  /* 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_release (in); +  gpgme_release (ctx); +  return 0;  } diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c index a6f80a4f..0783a9c6 100644 --- a/tests/gpgsm/t-encrypt.c +++ b/tests/gpgsm/t-encrypt.c @@ -1,4 +1,4 @@ -/* t-encrypt.c  - regression test +/* t-encrypt.c - Regression test.     Copyright (C) 2000 Werner Koch (dd9jn)     Copyright (C) 2001, 2002, 2003 g10 Code GmbH @@ -18,44 +18,36 @@     along with GPGME; if not, write to the Free Software Foundation,     Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */ -#include <stdio.h>  #include <stdlib.h> +#include <stdio.h>  #include <string.h> -#include <assert.h>  #include <gpgme.h> -#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 ("<!-- no operation info available -->"); -  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); @@ -63,73 +55,48 @@ print_data (GpgmeData dh)  int  -main (int argc, char **argv ) +main (int argc, char **argv)  { -    GpgmeCtx ctx; -    GpgmeError err; -    GpgmeData in, out; -    GpgmeRecipients rset; -    int loop = 0; +  GpgmeCtx ctx; +  GpgmeError err; +  GpgmeData in, out; +  GpgmeRecipients rset; +  GpgmeEncryptResult result; -    /* simple option parser; ignoring unknown options */ -    if (argc) -      { -        argc--; -        argv++; -      } -    while (argc && **argv == '-' ) -      { -        if (!strcmp (*argv, "--loop")) -          loop++; +  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS); +  fail_if_err (err); -        argc--; -        argv++; -        if (!strcmp (argv[-1], "--")) -          break; -      } -     +  err = gpgme_new (&ctx); +  fail_if_err (err); +  gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS); +  gpgme_set_armor (ctx, 1); -    err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS); -    fail_if_err (err); +  err = gpgme_data_new_from_mem (&in, "Hallo Leute\n", 12, 0); +  fail_if_err (err); -  do { -    err = gpgme_new (&ctx); -    fail_if_err (err); -    gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS); -    gpgme_set_armor (ctx, 1); - -    err = gpgme_data_new_from_mem ( &in, "Hallo Leute\n", 12, 0 ); -    fail_if_err (err); - -    err = gpgme_data_new ( &out ); -    fail_if_err (err); - -    err = gpgme_recipients_new (&rset); -    fail_if_err (err); -    if (argc) -      err = gpgme_recipients_add_name_with_validity (rset, *argv, -						     GPGME_VALIDITY_FULL); -    else -      err = gpgme_recipients_add_name_with_validity (rset, "test cert 1", -						     GPGME_VALIDITY_FULL); -    fail_if_err (err); - -    err = gpgme_op_encrypt (ctx, rset, in, out ); -    print_op_info (ctx); -    fail_if_err (err); +  err = gpgme_data_new (&out); +  fail_if_err (err); +     +  err = gpgme_recipients_new (&rset); +  fail_if_err (err); +  err = gpgme_recipients_add_name_with_validity (rset, "test cert 1", +						 GPGME_VALIDITY_FULL); +  fail_if_err (err); + +  err = gpgme_op_encrypt (ctx, rset, in, out); +  fail_if_err (err); +  result = gpgme_op_encrypt_result (ctx); +  if (result->invalid_recipients) +    { +      fprintf (stderr, "Invalid recipient encountered: %s\n", +	       result->invalid_recipients->id); +      exit (1); +    } +  print_data (out); -    fflush (NULL); -    fputs ("Begin Result:\n", stdout ); -    print_data (out); -    fputs ("End Result.\n", stdout ); -    -    gpgme_recipients_release (rset); -    gpgme_data_release (in); -    gpgme_data_release (out); -    gpgme_release (ctx); -  } while (loop); -    -    return 0; +  gpgme_recipients_release (rset); +  gpgme_data_release (in); +  gpgme_data_release (out); +  gpgme_release (ctx); +  return 0;  } - - diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c index 3f5a879c..a7530bae 100644 --- a/tests/gpgsm/t-genkey.c +++ b/tests/gpgsm/t-genkey.c @@ -38,38 +38,25 @@    while (0) -void -dump_data (GpgmeData dh) +static void +print_data (GpgmeData dh)  {  #define BUF_SIZE 512 -  char buffer[BUF_SIZE + 1]; -  int bufread; - -  gpgme_data_rewind (dh); - -  do -    { -      bufread = gpgme_data_read (dh, buffer, BUF_SIZE); -      if (bufread > 0) -	{ -	  buffer[bufread] = '\0'; -	  printf ("%s", buffer); -	} -    } -  while (bufread > 0); - -  if (bufread < 0) -    { -      fprintf (stderr, "%s:%d: gpgme_data_read failed: %s\n", -	       __FILE__, __LINE__, strerror (errno)); -      exit (1); -    } -  printf ("\n"); +  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, BUF_SIZE)) > 0) +    fwrite (buf, ret, 1, stdout); +  if (ret < 0) +    fail_if_err (GPGME_File_Error);  }  /* True if progress function printed something on the screen.  */ -int progress_called; +static int progress_called;  static void  progress (void *self, const char *what, int type, int current, int total) @@ -156,7 +143,7 @@ main (int argc, char **argv)      }    gpgme_release (ctx); -  dump_data (certreq); +  print_data (certreq);    gpgme_data_release (certreq);    return 0; diff --git a/tests/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c index b4c8332e..a9af38fb 100644 --- a/tests/gpgsm/t-sign.c +++ b/tests/gpgsm/t-sign.c @@ -1,118 +1,151 @@ -/* t-sign.c  - regression test - *	Copyright (C) 2000 Werner Koch (dd9jn) - *      Copyright (C) 2001 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 - */ +/* t-sign.c - Regression test. +   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 <stdio.h>  #include <stdlib.h> +#include <stdio.h>  #include <string.h> -#include <assert.h>  #include <gpgme.h> -#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 ("<!-- no operation info available -->"); -  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 void +check_result (GpgmeSignResult result, GpgmeSigMode type) +{ +  if (result->invalid_signers) +    { +      fprintf (stderr, "Invalid signer found: %s\n", +	       result->invalid_signers->id); +      exit (1); +    } +  if (!result->signatures || result->signatures->next) +    { +      fprintf (stderr, "Unexpected number of signatures created\n"); +      exit (1); +    } +  if (result->signatures->type != type) +    { +      fprintf (stderr, "Wrong type of signature created\n"); +      exit (1); +    } +  if (result->signatures->pubkey_algo != GPGME_PK_RSA) +    { +      fprintf (stderr, "Wrong pubkey algorithm reported: %i\n", +	       result->signatures->pubkey_algo); +      exit (1); +    } +  if (result->signatures->hash_algo != GPGME_MD_SHA1) +    { +      fprintf (stderr, "Wrong hash algorithm reported: %i\n", +	       result->signatures->hash_algo); +      exit (1); +    } +  if (result->signatures->class != 0) +    { +      fprintf (stderr, "Wrong signature class reported: %lu\n", +	       result->signatures->class); +      exit (1); +    } +  if (strcmp ("3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E", +	      result->signatures->fpr)) +    { +      fprintf (stderr, "Wrong fingerprint reported: %s\n", +	       result->signatures->fpr); +      exit (1); +    } +} + +  int   main (int argc, char **argv)  { -    GpgmeCtx ctx; -    GpgmeError err; -    GpgmeData in, out; - -  do { -    err = gpgme_new (&ctx); -    fail_if_err (err); -    gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS); -    gpgme_set_textmode (ctx, 1); -    gpgme_set_armor (ctx, 1); - -    err = gpgme_data_new_from_mem ( &in, "Hallo Leute!\n", 13, 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 */ -    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); -     +  GpgmeCtx ctx; +  GpgmeError err; +  GpgmeData in, out; +  GpgmeSignResult result; + +  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS); +  fail_if_err (err); + +  err = gpgme_new (&ctx); +  fail_if_err (err); + +  gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS); +  gpgme_set_textmode (ctx, 1); +  gpgme_set_armor (ctx, 1); + +  err = gpgme_data_new_from_mem (&in, "Hallo Leute!\n", 13, 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); -    /* ready */ -    gpgme_data_release (in); -    gpgme_release (ctx); -  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) ); -    -    return 0; +  /* 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); + +  gpgme_data_release (in); +  gpgme_release (ctx); +  return 0;  } | 
