doc/

2003-04-27  Marcus Brinkmann  <[email protected]>

	* gpgme.texi (Encrypting a Plaintext): Add info about
	GpgmeEncryptResult and gpgme_op_encrypt_result.

gpgme/
2003-04-27  Marcus Brinkmann  <[email protected]>

	* gpgme.h (GpgmeEncryptResult): New data type.
	(gpgme_op_encrypt_result): New prototype.
	* ops.h (_gpgme_op_encrypt_init_result): New prototype.
	(_gpgme_op_encrypt_status_handler): Fix prototype.
	* encrypt-sign.c (_gpgme_op_encrypt_sign_start): Call
	_gpgme_op_encrypt_init_result.
	* encrypt.c: Do not include <stdio.h>, <assert.h>, "util.h" and
	"wait.h".  Include <errno.h> and "gpgme.h".
	(SKIP_TOKEN_OR_RETURN): Remove macro.
	(struct encrypt_result): Rename to ...
	(op_data_t): ... new data type.  Rewrite for user result data.
	(append_xml_encinfo): Remove function.
	(release_op_data): New function.
	(gpgme_op_encrypt_result): New function.
	(_gpgme_op_encrypt_status_handler): Change first argument to void *.
	Rewrite result parsing.
	(_gpgme_op_encrypt_sym_status_handler): Change first argument to
	void *.
	(_gpgme_op_encrypt_init_result): New function.
	(_gpgme_op_encrypt_start): Rename to ...
	(encrypt_start): ... this.
	(gpgme_op_encrypt_start): Use encrypt_start, not
	gpgme_op_encrypt_start.
	(gpgme_op_encrypt): Likewise.

tests/
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.

1 files changed, 137 insertions, 114 deletions

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