1 files changed, 54 insertions, 87 deletions

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;
 }
-
-