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

	* gpg/: New directory.
	* Makefile.am, t-verify.c, t-encrypt.c, t-signers.c, t-trustlist.c,
	t-sign.c, t-keylist.c, t-import.c, t-genkey.c, t-export.c,
	t-decrypt-verify.c, t-decrypt.c, t-version.c, t-data.c, mkdemodirs.
	cipher-1.asc, cipher-2.asc, geheim.txt, pubdemo.asc, pubkey-1.asc,
	secdemo.asc, seckey-1.asc): Move to sub directory gpg/.

	* gpg/Makefile.am (INCLUDES): Include gpgme/, not include/ and
	intl/.
	(LDD): Correct relative path to gpgme library.
	(TESTS): Remove t-version and t-data.
	* gpg/t-verify.c, gpg/t-encrypt.c, gpg/t-signers.c, gpg/t-trustlist.c,
	gpg/t-sign.c, gpg/t-keylist.c, gpg/t-import.c, gpg/t-genkey.c,
	gpg/t-export.c, gpg/t-decrypt-verify.c, gpg/t-decrypt.c,
	t-version.c, t-data.c): Include gpgme.h, not "../gpgme/gpgme.h".

	* Makefile.am: New file.
	* gpgsm/: New directory.
	* gpgsm/Makefile.am: New file.

1 files changed, 0 insertions, 167 deletions

diff --git a/tests/t-signers.c b/tests/t-signers.c
deleted file mode 100644
index bdda2bce..00000000
--- a/tests/t-signers.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* t-signers.c  - Regression tests for the Gpgme multiple signers interface.
- *	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 "../gpgme/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);
-    }
-}
-
-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;
-}
-
-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.  */
-
-  err = gpgme_new (&ctx);
-  fail_if_err (err);
-  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);
-  
-  do
-    {
-      err = gpgme_new (&ctx);
-      fail_if_err (err);
-      if (!getenv ("GPG_AGENT_INFO"))
-	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.  */
-      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"));
-
-  gpgme_key_release (key[0]);
-  gpgme_key_release (key[1]);
-
-  return 0;
-}