gpgme/

2001-11-16  Marcus Brinkmann  <[email protected]>

	* decrypt-verify.c: New file.
	* Makefile.am (libgpgme_la_SOURCES): Add decrypt-verify.c.
	* types.h: Add decrypt-verify types.
	* ops.h: Likewise.
	* context.h: Add result type for decrypt-verify.
	* gpgme.h: Add decrypt-verify prototypes.

	* decrypt.c (decrypt_status_handler): Renamed to ...
	(_gpgme_decrypt_status_handler): ... this.  Make non-static.
	(_gpgme_decrypt_start): New function, derived from
	gpgme_op_decrypt_start.
	(gpgme_op_decrypt_start): Reimplement in terms of
	_gpgme_decrypt_start.
	(_gpgme_decrypt_result): New function to retrieve error value.
	(gpgme_op_decrypt): Use _gpgme_decrypt_result.
	* ops.h: Add prototypes for new functions.

	* verify.c (verify_status_handler): Renamed to ...
	(_gpgme_verify_status_handler): ... this.  Make non-static.
	(gpgme_op_verify_start): Use new function name.
	(intersect_stati): Renamed to ...
	(_gpgme_intersect_stati): ... this.  Make non-static.
	(gpgme_op_verify): Use new name.
	* ops.h: Add prototypes for new functions.

tests/
2001-11-16  Marcus Brinkmann  <[email protected]>

	* Makefile.am (TESTS): Add t-decrypt-verify.
	* t-decrypt-verify.c: New file.
	* cipher-2.asc: Likewise.

1 files changed, 147 insertions, 0 deletions

diff --git a/tests/t-decrypt-verify.c b/tests/t-decrypt-verify.c
new file mode 100644
index 00000000..1c1f143e
--- /dev/null
+++ b/tests/t-decrypt-verify.c
@@ -0,0 +1,147 @@
+/* t-decrypt-verify.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
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <errno.h>
+#include <mcheck.h>
+
+#include "../gpgme/gpgme.h"
+
+struct passphrase_cb_info_s
+{
+  GpgmeCtx c;
+  int did_it;
+};
+
+
+#define fail_if_err(a) do { if(a) { int my_errno = errno;	\
+            fprintf (stderr, "%s:%d: GpgmeError %s\n",		\
+                 __FILE__, __LINE__, gpgme_strerror(a));	\
+            if ((a) == GPGME_File_Error)			\
+                   fprintf (stderr, "\terrno=`%s'\n", strerror (my_errno)); \
+                   exit (1); }					\
+                             } while(0)
+
+static void
+print_data (GpgmeData dh)
+{
+  char buf[100];
+  size_t nread;
+  GpgmeError err;
+
+  err = gpgme_data_rewind (dh);
+  fail_if_err (err);
+  while (!(err = gpgme_data_read (dh, buf, 100, &nread)))
+    fwrite ( buf, nread, 1, stdout );
+  if (err != GPGME_EOF) 
+    fail_if_err (err);
+}
+
+static const char *
+passphrase_cb (void *opaque, const char *desc, void *r_hd)
+{
+  const char *pass;
+
+  if ( !desc )
+    {
+      /* Cleanup by looking at *r_hd.  */
+      return NULL;
+    }
+
+  pass = "abc";
+  fprintf (stderr, "%% requesting passphrase for `%s': ", desc);
+  fprintf (stderr, "sending `%s'\n", pass);
+
+  return pass;
+}
+
+static char *
+mk_fname (const char *fname)
+{
+  const char *srcdir = getenv ("srcdir");
+  char *buf;
+
+  if (!srcdir)
+    srcdir = ".";
+  buf = malloc (strlen(srcdir) + strlen(fname) + 2);
+  if (!buf)
+    exit (8);
+  strcpy (buf, srcdir);
+  strcat (buf, "/");
+  strcat (buf, fname);
+  return buf;
+}
+
+int 
+main (int argc, char **argv)
+{
+  GpgmeCtx ctx;
+  GpgmeError err;
+  GpgmeData in, out, pwdata = NULL;
+  struct passphrase_cb_info_s info;
+  const char *cipher_2_asc = mk_fname ("cipher-2.asc");
+  GpgmeSigStat stat;
+
+  do
+    {
+      err = gpgme_new (&ctx);
+      fail_if_err (err);
+      if (!getenv("GPG_AGENT_INFO"))
+	{
+	  memset (&info, 0, sizeof info);
+	  info.c = ctx;
+	  gpgme_set_passphrase_cb (ctx, passphrase_cb, &info);
+	} 
+
+      err = gpgme_data_new_from_file (&in, cipher_2_asc, 1);
+      fail_if_err (err);
+
+      err = gpgme_data_new (&out);
+      fail_if_err (err);
+
+      err = gpgme_op_decrypt_verify (ctx, in, out, &stat);
+      fail_if_err (err);
+    
+      fflush (NULL);
+      fputs ("Begin Result:\n", stdout);
+      print_data (out);
+      fputs ("End Result.\n", stdout);
+   
+      if (stat != GPGME_SIG_STAT_GOOD)
+	{
+	  fprintf (stderr, "Signature check failed unexpectedly.\n");
+	  exit (1);
+	}
+
+      gpgme_data_release (in);
+      gpgme_data_release (out);
+      gpgme_data_release (pwdata);
+      gpgme_release (ctx);
+    }
+  while (argc > 1 && !strcmp (argv[1], "--loop"));
+
+  return 0;
+}
+
+