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, 161 insertions, 0 deletions

diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
new file mode 100644
index 00000000..1e06d86f
--- /dev/null
+++ b/tests/gpg/t-keylist.c
@@ -0,0 +1,161 @@
+/* t-keylist.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
+doit ( GpgmeCtx ctx, const char *pattern )
+{
+    GpgmeError err;
+    GpgmeKey key;
+
+    err = gpgme_op_keylist_start (ctx, pattern, 0 );
+    fail_if_err (err);
+    
+    while ( !(err = gpgme_op_keylist_next ( ctx, &key )) ) {
+        char *p;
+        const char *s;
+        int i;
+
+        printf ("<!-- Begin key object (%p) -->\n", key );
+        p = gpgme_key_get_as_xml ( key );
+        if ( p ) {
+            fputs ( p, stdout );
+            free (p);
+        }
+        else
+            fputs("<!-- Ooops: gpgme_key_get_as_xml failed -->\n", stdout );
+
+        
+        for (i=0; ; i++ ) {
+            s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEYID, NULL, i );
+            if (!s)
+                break;
+            printf ("<!-- keyid.%d=%s -->\n", i, s );
+            s = gpgme_key_get_string_attr (key, GPGME_ATTR_ALGO, NULL, i );
+            printf ("<!-- algo.%d=%s -->\n", i, s );
+            s = gpgme_key_get_string_attr (key, GPGME_ATTR_KEY_CAPS, NULL, i );
+            printf ("<!-- caps.%d=%s -->\n", i, s );
+        }
+        for (i=0; ; i++ ) {
+            s = gpgme_key_get_string_attr (key, GPGME_ATTR_NAME, NULL, i );
+            if (!s)
+                break;
+            printf ("<!-- name.%d=%s -->\n", i, s );
+            s = gpgme_key_get_string_attr (key, GPGME_ATTR_EMAIL, NULL, i );
+            printf ("<!-- email.%d=%s -->\n", i, s );
+            s = gpgme_key_get_string_attr (key, GPGME_ATTR_COMMENT, NULL, i );
+            printf ("<!-- comment.%d=%s -->\n", i, s );
+        }
+        
+        fputs ("<!-- usable for:", stdout );
+        if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_ENCRYPT, NULL, 0 ))
+            fputs (" encryption", stdout);
+        if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_SIGN, NULL, 0 ))
+            fputs (" signing", stdout);
+        if ( gpgme_key_get_ulong_attr (key, GPGME_ATTR_CAN_CERTIFY, NULL, 0 ))
+            fputs (" certification", stdout);
+        fputs (" -->\n", stdout );
+
+        printf ("<!-- End key object (%p) -->\n", key );
+        gpgme_key_release (key);
+    }
+    if ( err != GPGME_EOF )
+        fail_if_err (err);
+}
+
+
+/* 
+ * Check that there are no problems when we are using two context for
+ * listing keys. 
+ */
+static void
+check_two_contexts (void)
+{
+    GpgmeError err;
+    GpgmeCtx ctx1, ctx2;
+    GpgmeKey key;
+	
+    err = gpgme_new(&ctx1); fail_if_err (err);
+    err = gpgme_op_keylist_start(ctx1, "", 1); fail_if_err (err);
+    err = gpgme_new(&ctx2); fail_if_err (err);
+    err = gpgme_op_keylist_start(ctx2, "", 1); fail_if_err (err);
+
+    while ( (err=gpgme_op_keylist_next(ctx2, &key)) != GPGME_EOF) {
+        gpgme_key_release (key);
+    }
+    if (err != GPGME_EOF)
+        fail_if_err (err);
+    while ( (err=gpgme_op_keylist_next(ctx1, &key)) != GPGME_EOF) {
+        gpgme_key_release (key);
+    }
+    if (err != GPGME_EOF)
+        fail_if_err (err);
+}
+
+int 
+main (int argc, char **argv )
+{
+    GpgmeCtx ctx;
+    GpgmeError err;
+    int loop = 0;
+    const char *pattern;
+    
+    if( argc ) {
+        argc--; argv++;
+    }
+    
+    if (argc && !strcmp( *argv, "--loop" ) ) {
+        loop = 1;
+        argc--; argv++;
+    }
+    pattern = argc? *argv : NULL;
+
+    err = gpgme_check_engine();
+    fail_if_err (err);
+
+    err = gpgme_new (&ctx);
+    fail_if_err (err);
+    gpgme_set_keylist_mode (ctx, 1); /* no validity calculation */
+    do {
+        fprintf (stderr, "** pattern=`%s'\n", pattern );
+        doit ( ctx, pattern );
+    } while ( loop );
+    gpgme_release (ctx);
+
+    check_two_contexts ();
+
+    return 0;
+}
+
+
+