2001-12-14 Marcus Brinkmann <[email protected]>

	* configure.ac (GPG): Substitute this variable.
	(GPGSM): Likewise.

tests/
CVS2001-12-14  Marcus Brinkmann  <[email protected]>

	* gpg/Makefile.am (GPG): Set to @GPG_PATH@.
	(./pubring.gpg): Use $(GPG) instead gpg.
	(./secring.gpg): Likewise.

	* gpgsm/t-import.c (main): Remove third test case.
	* gpgsm/Makefile.am (GPGSM): Set to @GPGSM@.
	(all-local): New target.
	(./pubcerts.kbx): Likewise.
	* gpgsm/t-encrypt.c: New file.
	* gpgsm/Makefile.am (TESTS): Add t-encrypt.

8 files changed, 149 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index e98b1b46..82873372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-14  Marcus Brinkmann  <[email protected]>
+
+	* configure.ac (GPG): Substitute this variable.
+	(GPGSM): Likewise.
+
 2001-11-22  Marcus Brinkmann  <[email protected]>
 
 	* configure.ac (AC_CONFIG_FILES): Add tests/gpg/Makefile and
diff --git a/configure.ac b/configure.ac
index 928008a6..b597653c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,9 +141,11 @@ if test "$GPG" = no; then
   fi
 else
   AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG")
+  AC_SUBST(GPG)
 fi
 AM_CONDITIONAL(RUN_GPG_TESTS,
   [test "$cross_compiling" != "yes" && test -n "$GPG" && test -r "$GPG"])
+AC_SUBST(GPG_PATH)
 
 NO_OVERRIDE=no
 AC_ARG_WITH(gpgsm,
@@ -169,6 +171,7 @@ if test "$GPGSM" = no; then
   fi
 else
   AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM")
+  AC_SUBST(GPGSM)
 fi
 AM_CONDITIONAL(RUN_GPGSM_TESTS,
   [test "$cross_compiling" != "yes" && test -n "$GPGSM" && test -r "$GPGSM"])
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 775d44ae..c9b5b9c2 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -536,8 +536,8 @@ gpgsm_status_handler (void *opaque, int pid, int fd)
 	  /* FIXME Save error somewhere.  */
 	  if (gpgsm->status.fnc)
 	    gpgsm->status.fnc (gpgsm->status.fnc_value, STATUS_EOF, "");
-	  if (gpgsm->output_fd)
-	    _gpgme_freeze_fd (gpgsm->output_fd);
+	  /*	  if (gpgsm->output_fd)
+		  _gpgme_freeze_fd (gpgsm->output_fd); */
 	  return 1;
 	}
 
diff --git a/tests/ChangeLog b/tests/ChangeLog
index fa8712ad..34bd5797 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,18 @@
 2001-12-14  Marcus Brinkmann  <[email protected]>
 
+	* gpg/Makefile.am (GPG): Set to @GPG_PATH@.
+	(./pubring.gpg): Use $(GPG) instead gpg.
+	(./secring.gpg): Likewise.
+
+	* gpgsm/t-import.c (main): Remove third test case.
+	* gpgsm/Makefile.am (GPGSM): Set to @GPGSM@.
+	(all-local): New target.
+	(./pubcerts.kbx): Likewise.
+	* gpgsm/t-encrypt.c: New file.
+	* gpgsm/Makefile.am (TESTS): Add t-encrypt.
+
+2001-12-14  Marcus Brinkmann  <[email protected]>
+
 	* gpgsm/t-keylist.c: New file.
 	* gpgsm/Makefile.am (TESTS): Add t-keylist.
 
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index d313b3ab..a0777f09 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -19,6 +19,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
+GPG = @GPG@
 
 TESTS_ENVIRONMENT = GNUPGHOME=.
 
@@ -42,17 +43,10 @@ distclean-local:
 all-local: ./pubring.gpg ./secring.gpg
 
 ./pubring.gpg: $(srcdir)/pubdemo.asc
-	-gpg --homedir . --import $(srcdir)/pubdemo.asc
+	$(GPG) --homedir . --import $(srcdir)/pubdemo.asc
 
 ./secring.gpg: ./Alpha/Secret.gpg 
-	-gpg --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
+	$(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
 
 ./Alpha/Secret.gpg: secdemo.asc 
 	srcdir=$(srcdir) $(srcdir)/mkdemodirs 
-
-
-
-
-
-
-
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index bf724fb4..b08af8bb 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -19,10 +19,11 @@
 
 ## Process this file with automake to produce Makefile.in
 
+GPGSM = @GPGSM@
 
 TESTS_ENVIRONMENT = GNUPGHOME=.
 
-TESTS = t-import t-keylist
+TESTS = t-import t-keylist t-encrypt
 
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der
 
@@ -31,3 +32,8 @@ INCLUDES = -I$(top_srcdir)/gpgme
 LDADD = ../../gpgme/libgpgme.la
 
 noinst_PROGRAMS = $(TESTS)
+
+all-local: ./pubcerts.kbx
+
+./pubcerts.kbx: $(srcdir)/cert_g10code_test1.der
+	$(GPGSM) --homedir . --import $(srcdir)/cert_g10code_test1.der
diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
new file mode 100644
index 00000000..7b848d3d
--- /dev/null
+++ b/tests/gpgsm/t-encrypt.c
@@ -0,0 +1,116 @@
+/* t-encrypt.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 <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);
+}
+
+
+
+int 
+main (int argc, char **argv )
+{
+    GpgmeCtx ctx;
+    GpgmeError err;
+    GpgmeData in, out;
+    GpgmeRecipients rset;
+
+    err = gpgme_check_engine ();
+    fail_if_err (err);
+    puts ( gpgme_get_engine_info() );
+
+  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);
+    err = gpgme_recipients_add_name_with_validity (rset,
+     "/CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE",
+                                                   GPGME_VALIDITY_FULL);
+    fail_if_err (err);
+
+    err = gpgme_op_encrypt (ctx, rset, in, out );
+    print_op_info (ctx);
+    fail_if_err (err);
+
+    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;
+}
+
+
diff --git a/tests/gpgsm/t-import.c b/tests/gpgsm/t-import.c
index b0f8c360..f62ff003 100644
--- a/tests/gpgsm/t-import.c
+++ b/tests/gpgsm/t-import.c
@@ -65,7 +65,6 @@ main (int argc, char **argv)
   GpgmeData in;
   const char *cert_1 = make_filename ("cert_dfn_pca01.der");
   const char *cert_2 = make_filename ("cert_dfn_pca15.der");
-  const char *cert_3 = make_filename ("cert_g10code_test1.der");
 
   do
     {
@@ -88,14 +87,6 @@ main (int argc, char **argv)
       fail_if_err (err);
 
       gpgme_data_release (in);
-
-      err = gpgme_data_new_from_file (&in, cert_3, 1);
-      fail_if_err (err);
-
-      err = gpgme_op_import (ctx, in);
-      fail_if_err (err);
-
-      gpgme_data_release (in);
       gpgme_release (ctx);
     }
   while (argc > 1 && !strcmp (argv[1], "--loop"));