* gpgsm/t-sign.c (main): Also test a normal signature.

* gpg/Makefile (TESTS_ENVIRONMENT): Set GPG_AGENT_INFO empty.
* gpg/t-signers.c, gpg/t-sign.c, gpg/t-encrypt-sym.c
* gpg/t-encrypt-sign.c, gpg/t-decrypt.c
* gpg/t-decrypt-verify.c (main): Changed the GPG_AGENT_INFO check to
match the one in ../../gpgme/rungpg.c.

diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog
index aea23e59f1190878bfef64e214eaf49c7732bd83..2222de127a49d265b9004acfb983d3728375f7cd 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,3 +1,13 @@
+2002-06-20  Werner Koch  <wk@gnupg.org>
+
+       * gpgsm/t-sign.c (main): Also test a normal signature.
+
+       * gpg/Makefile (TESTS_ENVIRONMENT): Set GPG_AGENT_INFO empty.
+       * gpg/t-signers.c, gpg/t-sign.c, gpg/t-encrypt-sym.c
+       * gpg/t-encrypt-sign.c, gpg/t-decrypt.c
+       * gpg/t-decrypt-verify.c (main): Changed the GPG_AGENT_INFO check to
+       match the one in ../../gpgme/rungpg.c.
+
 2002-06-12  Werner Koch  <wk@gnupg.org>
 
        * gpgsm/t-keylist.c (doit): Print operation info if available.

diff --git a/trunk/tests/gpg/Makefile.am b/trunk/tests/gpg/Makefile.am
index 04c0d11029f862edf758453fc019e10ce2abaf79..456d63d31a8896e3a191e4138154fe109af873c7 100644 (file)
--- a/trunk/tests/gpg/Makefile.am
+++ b/trunk/tests/gpg/Makefile.am
@@ -21,7 +21,7 @@
 
 GPG = @GPG@
 
-TESTS_ENVIRONMENT = GNUPGHOME=.
+TESTS_ENVIRONMENT = GNUPGHOME=. GPG_AGENT_INFO=
 
 TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers        \
        t-decrypt t-verify t-decrypt-verify t-keylist t-export  \

diff --git a/trunk/tests/gpg/t-decrypt-verify.c b/trunk/tests/gpg/t-decrypt-verify.c
index bf407eec1205270f088a60a28e695709696cdee7..0c85d1be80b944c3cb717b8505bbc4fde001f848 100644 (file)
--- a/trunk/tests/gpg/t-decrypt-verify.c
+++ b/trunk/tests/gpg/t-decrypt-verify.c
@@ -101,12 +101,15 @@ main (int argc, char **argv)
   struct passphrase_cb_info_s info;
   const char *cipher_2_asc = mk_fname ("cipher-2.asc");
   GpgmeSigStat stat;
+  char *p;
 
   do
     {
       err = gpgme_new (&ctx);
       fail_if_err (err);
-      if (!getenv("GPG_AGENT_INFO"))
+
+      p = getenv("GPG_AGENT_INFO");
+      if (!(p && strchr (p, ':')))
        {
          memset (&info, 0, sizeof info);
          info.c = ctx;

diff --git a/trunk/tests/gpg/t-decrypt.c b/trunk/tests/gpg/t-decrypt.c
index e6bc099d3ea3906fd6e4d1733953faa40eec7a5d..6b21d41640e57d9a8400a2025960b26e0bc24a9b 100644 (file)
--- a/trunk/tests/gpg/t-decrypt.c
+++ b/trunk/tests/gpg/t-decrypt.c
@@ -103,15 +103,19 @@ main (int argc, char **argv )
     GpgmeData in, out, pwdata = NULL;
     struct passphrase_cb_info_s info;
     const char *cipher_1_asc = mk_fname ("cipher-1.asc");
+    char *p;
 
   do {
     err = gpgme_new (&ctx);
     fail_if_err (err);
-    if ( !getenv("GPG_AGENT_INFO") ) {
+
+    p = getenv("GPG_AGENT_INFO");
+    if (!(p && strchr (p, ':')))
+      {
         memset ( &info, 0, sizeof info );
         info.c = ctx;
         gpgme_set_passphrase_cb ( ctx, passphrase_cb, &info );
-    } 
+      } 
 
     err = gpgme_data_new_from_file ( &in, cipher_1_asc, 1 );
     fail_if_err (err);

diff --git a/trunk/tests/gpg/t-encrypt-sign.c b/trunk/tests/gpg/t-encrypt-sign.c
index a4620d2991ebc062f808f987ee074d9fb62671ec..b92d74c8e0bcd7b1451f07faa90f631edd0826ab 100644 (file)
--- a/trunk/tests/gpg/t-encrypt-sign.c
+++ b/trunk/tests/gpg/t-encrypt-sign.c
@@ -90,6 +90,7 @@ main (int argc, char **argv )
     GpgmeError err;
     GpgmeData in, out;
     GpgmeRecipients rset;
+    char *p;
 
     err = gpgme_check_engine ();
     fail_if_err (err);
@@ -99,7 +100,9 @@ main (int argc, char **argv )
     err = gpgme_new (&ctx);
     fail_if_err (err);
     gpgme_set_armor (ctx, 1);
-    if (!getenv("GPG_AGENT_INFO"))
+
+    p = getenv("GPG_AGENT_INFO");
+    if (!(p && strchr (p, ':')))
       gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
 
     err = gpgme_data_new_from_mem ( &in, "Hallo Leute\n", 12, 0 );

diff --git a/trunk/tests/gpg/t-encrypt-sym.c b/trunk/tests/gpg/t-encrypt-sym.c
index 72672d3eb77a5e64aa957f8dfcef3ff2dda19f94..6c765b847ad278789c322e9900d51a53fd82cd70 100644 (file)
--- a/trunk/tests/gpg/t-encrypt-sym.c
+++ b/trunk/tests/gpg/t-encrypt-sym.c
@@ -76,6 +76,7 @@ main (int argc, char **argv)
   GpgmeData plain, cipher;
   const char *text = "Hallo Leute\n";
   char *text2;
+  char *p;
   int i;
 
   err = gpgme_check_engine ();
@@ -86,8 +87,10 @@ main (int argc, char **argv)
       err = gpgme_new (&ctx);
       fail_if_err (err);
       gpgme_set_armor (ctx, 1);
-      if (!getenv("GPG_AGENT_INFO"))
-       gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
+
+      p = getenv("GPG_AGENT_INFO");
+      if (!(p && strchr (p, ':')))
+        gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
 
       err = gpgme_data_new_from_mem (&plain, text, strlen (text), 0);
       fail_if_err (err);

diff --git a/trunk/tests/gpg/t-sign.c b/trunk/tests/gpg/t-sign.c
index 28c34dca5fd29b63b1d89049eb8ccef0ae417650..0e5f5c36cfad13b55c18b854968f50dcdefb851f 100644 (file)
--- a/trunk/tests/gpg/t-sign.c
+++ b/trunk/tests/gpg/t-sign.c
@@ -87,13 +87,15 @@ main (int argc, char **argv )
     GpgmeCtx ctx;
     GpgmeError err;
     GpgmeData in, out;
+    char *p;
 
   do {
     err = gpgme_new (&ctx);
     fail_if_err (err);
-    if ( !getenv("GPG_AGENT_INFO") ) {
-        gpgme_set_passphrase_cb ( ctx, passphrase_cb, NULL );
-    } 
+
+    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);

diff --git a/trunk/tests/gpg/t-signers.c b/trunk/tests/gpg/t-signers.c
index f3fa6f5c08e9736b98916e0f7e150c89c56b9f51..d0aa00b30ce4de7acc90b66d5dff73d0833173ca 100644 (file)
--- a/trunk/tests/gpg/t-signers.c
+++ b/trunk/tests/gpg/t-signers.c
@@ -86,6 +86,7 @@ main (int argc, char *argv[])
   GpgmeError err;
   GpgmeData in, out;
   GpgmeKey key[2];  /* There are two secret keys in the test area.  */
+  char *p;
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -101,7 +102,9 @@ main (int argc, char *argv[])
     {
       err = gpgme_new (&ctx);
       fail_if_err (err);
-      if (!getenv ("GPG_AGENT_INFO"))
+
+      p = getenv("GPG_AGENT_INFO");
+      if (!(p && strchr (p, ':')))
        gpgme_set_passphrase_cb (ctx, passphrase_cb, NULL);
       err = gpgme_signers_add (ctx, key[0]);
       fail_if_err (err);

diff --git a/trunk/tests/gpgsm/t-sign.c b/trunk/tests/gpgsm/t-sign.c
index fd656a9674e0551c3b359a63e13285653bfe21a2..5d54475524fd7c162bcf95601ee09a22a3dc0522 100644 (file)
--- a/trunk/tests/gpgsm/t-sign.c
+++ b/trunk/tests/gpgsm/t-sign.c
@@ -78,7 +78,6 @@ main (int argc, char **argv )
     err = gpgme_data_new_from_mem ( &in, "Hallo Leute!\n", 13, 0 );
     fail_if_err (err);
 
-#if 0
     /* first a normal signature */
     err = gpgme_data_new ( &out );
     fail_if_err (err);
@@ -91,7 +90,6 @@ main (int argc, char **argv )
     fputs ("End Result.\n", stdout );
     gpgme_data_release (out);
     gpgme_data_rewind (in);
-#endif
     
     /* now a detached signature */
     err = gpgme_data_new ( &out );
@@ -106,21 +104,6 @@ main (int argc, char **argv )
     gpgme_data_release (out);
     gpgme_data_rewind (in);
     
-
-#if 0
-    /* 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);
-#endif
     
     /* ready */
     gpgme_data_release (in);