aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg/t-encrypt-sign.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2002-06-20 13:47:24 +0000
committerWerner Koch <[email protected]>2002-06-20 13:47:24 +0000
commite6dc9fd6c4d00455975fc4bb6d98f31b3c36b517 (patch)
tree202011f43559a5317cb1cb7585f4cac534c8258d /tests/gpg/t-encrypt-sign.c
parent* rungpg.c (build_argv): Ignore GPG_AGENT_INFO if set but empty. (diff)
downloadgpgme-e6dc9fd6c4d00455975fc4bb6d98f31b3c36b517.tar.gz
gpgme-e6dc9fd6c4d00455975fc4bb6d98f31b3c36b517.zip
* 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.
Diffstat (limited to '')
-rw-r--r--tests/gpg/t-encrypt-sign.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index a4620d29..b92d74c8 100644
--- a/tests/gpg/t-encrypt-sign.c
+++ b/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 );