2003-09-14 Marcus Brinkmann <marcus@g10code.de>

	* gpg/t-import.c (main): Likewise.
	* gpg/t-keylist-sig.c (main): Likewise.
	* gpg/t-keylist.c (main): Likewise.
	* gpg/t-sign.c (main): Likewise.
	* gpg/t-signers.c (main): Likewise.
	* gpg/t-trustlist.c (main): Likewise.
	* gpgsm/t-support.h: Include <stdlib.h> and <locale.h>.
	(init_gpgme): New function.
	* gpg/t-support.h: Likewise.
	* gpgsm/t-verify.c (main): Call init_gpgme.
	* gpgsm/t-decrypt.c (main): Likewise.
	* gpgsm/t-encrypt.c (main): Likewise.
	* gpgsm/t-export.c (main): Likewise.
	* gpgsm/t-genkey.c (main): Likewise.
	* gpgsm/t-import.c (main): Likewise.
	* gpgsm/t-keylist.c (main): Likewise.
	* gpgsm/t-sign.c (main): Likewise.
	* gpg/t-verify.c (main): Call init_gpgme.
	* gpg/t-decrypt-verify.c (main): Likewise.
	* gpg/t-decrypt.c (main): Likewise.
	* gpg/t-edit.c (main): Likewise.
	* gpg/t-encrypt-sign.c (main): Likewise.
	* gpg/t-encrypt-sym.c (main): Likewise.
	* gpg/t-encrypt.c (main): Likewise.
	* gpg/t-eventloop.c (main): Likewise.
	* gpg/t-export.c (main): Likewise.
	* gpg/t-genkey.c (main): Likewise.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 062675123556dfb346a46ba5074631f23de30013..cf68e287410e119485562e78a9f3f9c71fb0d826 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,33 @@
+2003-09-14  Marcus Brinkmann  <marcus@g10code.de>
+
+       * gpg/t-import.c (main): Likewise.
+       * gpg/t-keylist-sig.c (main): Likewise.
+       * gpg/t-keylist.c (main): Likewise.
+       * gpg/t-sign.c (main): Likewise.
+       * gpg/t-signers.c (main): Likewise.
+       * gpg/t-trustlist.c (main): Likewise.
+       * gpgsm/t-support.h: Include <stdlib.h> and <locale.h>.
+       (init_gpgme): New function.
+       * gpg/t-support.h: Likewise.
+       * gpgsm/t-verify.c (main): Call init_gpgme.
+       * gpgsm/t-decrypt.c (main): Likewise.
+       * gpgsm/t-encrypt.c (main): Likewise.
+       * gpgsm/t-export.c (main): Likewise.
+       * gpgsm/t-genkey.c (main): Likewise.
+       * gpgsm/t-import.c (main): Likewise.
+       * gpgsm/t-keylist.c (main): Likewise.
+       * gpgsm/t-sign.c (main): Likewise.
+       * gpg/t-verify.c (main): Call init_gpgme.
+       * gpg/t-decrypt-verify.c (main): Likewise.
+       * gpg/t-decrypt.c (main): Likewise.
+       * gpg/t-edit.c (main): Likewise.
+       * gpg/t-encrypt-sign.c (main): Likewise.
+       * gpg/t-encrypt-sym.c (main): Likewise.
+       * gpg/t-encrypt.c (main): Likewise.
+       * gpg/t-eventloop.c (main): Likewise.
+       * gpg/t-export.c (main): Likewise.
+       * gpg/t-genkey.c (main): Likewise.
+
 2003-08-14  Marcus Brinkmann  <marcus@g10code.de>
 
        * gpg/t-sign.c (check_result): Change output format for signature

diff --git a/tests/gpg/t-decrypt-verify.c b/tests/gpg/t-decrypt-verify.c
index a9c04afb55ca522382c76167d7c0cbca754cb72c..5cbfd0deebd35365f9c921379fbe2885222db519 100644 (file)
--- a/tests/gpg/t-decrypt-verify.c
+++ b/tests/gpg/t-decrypt-verify.c
@@ -98,6 +98,8 @@ main (int argc, char *argv[])
   const char *cipher_2_asc = make_filename ("cipher-2.asc");
   char *agent_info;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 
@@ -130,5 +132,3 @@ main (int argc, char *argv[])
   gpgme_release (ctx);
   return 0;
 }
-
-

diff --git a/tests/gpg/t-decrypt.c b/tests/gpg/t-decrypt.c
index 8c18d78351357a9f7e4f67917ad927d0f3287a7d..bfe05b29c7b3d2edd90a3a3161bead0a3a1176ef 100644 (file)
--- a/tests/gpg/t-decrypt.c
+++ b/tests/gpg/t-decrypt.c
@@ -39,6 +39,8 @@ main (int argc, char *argv[])
   const char *cipher_1_asc = make_filename ("cipher-1.asc");
   char *agent_info;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 

diff --git a/tests/gpg/t-edit.c b/tests/gpg/t-edit.c
index d2d2e1b892f1956e6ec47e98020f09f048d16597..cefcbc4132de8383556e55a184fde9a7bab7722d 100644 (file)
--- a/tests/gpg/t-edit.c
+++ b/tests/gpg/t-edit.c
@@ -113,6 +113,8 @@ main (int argc, char **argv)
   const char *pattern = "Alpha";
   char *agent_info;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   err = gpgme_data_new (&out);
@@ -141,5 +143,3 @@ main (int argc, char **argv)
 
   return 0;
 }
-
-

diff --git a/tests/gpg/t-encrypt-sign.c b/tests/gpg/t-encrypt-sign.c
index 858a99c3f94cb6505fc66d29a4f1f7e30faa5d10..19618c4305e2088da071fb98e102c855fdc4fe85 100644 (file)
--- a/tests/gpg/t-encrypt-sign.c
+++ b/tests/gpg/t-encrypt-sign.c
@@ -86,8 +86,7 @@ main (int argc, char **argv)
   gpgme_sign_result_t sign_result;
   char *agent_info;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
     
   err = gpgme_new (&ctx);
   fail_if_err (err);

diff --git a/tests/gpg/t-encrypt-sym.c b/tests/gpg/t-encrypt-sym.c
index 7c84f3dc79956b0b929b504e576580ca15eba736..29a3f47c60d070bce6155bb7d732b6f5d118148e 100644 (file)
--- a/tests/gpg/t-encrypt-sym.c
+++ b/tests/gpg/t-encrypt-sym.c
@@ -40,8 +40,7 @@ main (int argc, char *argv[])
   char *p;
   size_t len;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -90,5 +89,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
-

diff --git a/tests/gpg/t-encrypt.c b/tests/gpg/t-encrypt.c
index 11ebf3f4b2ff06a25c714a096293e8259ffe553e..756d216bfd2256dcf8b1f790b308b18ca97ee32b 100644 (file)
--- a/tests/gpg/t-encrypt.c
+++ b/tests/gpg/t-encrypt.c
@@ -36,10 +36,7 @@ main (int argc, char *argv[])
   gpgme_key_t key[3] = { NULL, NULL, NULL };
   gpgme_encrypt_result_t result;
 
-  gpgme_check_version (0);
-
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
     
   err = gpgme_new (&ctx);
   fail_if_err (err);

diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index 43e2c09b2ce44eaf0c109b06566154ee3a122ff0..7e8be3c3ef16302b040ce45025ac325b85ce11fd 100644 (file)
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -168,6 +168,8 @@ main (int argc, char *argv[])
   gpgme_key_t key[3] = { NULL, NULL, NULL };
   int i;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   for (i = 0; i < FDLIST_MAX; i++)
     fdlist[i].fd = -1;
 

diff --git a/tests/gpg/t-export.c b/tests/gpg/t-export.c
index a5c24fc60bb910c817ca84b3acef971b8e2e650a..44c48f93e7cac2592a5c8e3520e71fe21ec18ecb 100644 (file)
--- a/tests/gpg/t-export.c
+++ b/tests/gpg/t-export.c
@@ -36,6 +36,8 @@ main (int argc, char **argv)
   gpgme_data_t  out;
   const char *pattern[] = { "Alpha", "Bob", NULL };
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 

diff --git a/tests/gpg/t-genkey.c b/tests/gpg/t-genkey.c
index b218122e6a085e2bbfe754ea0fbfea1dc0a83bc2..52bb99f2d92cfe353155be749cf1fc1370b2d848 100644 (file)
--- a/tests/gpg/t-genkey.c
+++ b/tests/gpg/t-genkey.c
@@ -68,6 +68,8 @@ main (int argc, char **argv)
     "</GnupgKeyParms>\n";
   gpgme_genkey_result_t result;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 

diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index 3733d5c6f8828d8db4d0bbef3a56ba9c4c51acb4..22528e01771b6a38f81c66d3997ab32e9c51feaa 100644 (file)
--- a/tests/gpg/t-import.c
+++ b/tests/gpg/t-import.c
@@ -203,6 +203,8 @@ main (int argc, char *argv[])
   const char *pubkey_1_asc = make_filename ("pubkey-1.asc");
   const char *seckey_1_asc = make_filename ("seckey-1.asc");
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 

diff --git a/tests/gpg/t-keylist-sig.c b/tests/gpg/t-keylist-sig.c
index 88549d2646150cc19d8dc0722804fb4f16e1bb98..6578eeb0ceb922dfa907e349e3418e1f42b16fd7 100644 (file)
--- a/tests/gpg/t-keylist-sig.c
+++ b/tests/gpg/t-keylist-sig.c
@@ -74,8 +74,7 @@ main (int argc, char **argv)
   int mode;
   int i = 0;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);

diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index 9e68f0cc1ec827e0793d47f80415b3ab31221d97..17c35edba9432c7f9e9be25667d519f0002fa330 100644 (file)
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -113,8 +113,7 @@ main (int argc, char **argv)
   gpgme_keylist_result_t result;
   int i = 0;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);

diff --git a/tests/gpg/t-sign.c b/tests/gpg/t-sign.c
index 78e590b97eee92f507c8f199f191875589324a78..1b9d06d4390650cf4296099fa1e3149d967ecc4a 100644 (file)
--- a/tests/gpg/t-sign.c
+++ b/tests/gpg/t-sign.c
@@ -84,6 +84,8 @@ main (int argc, char **argv)
   gpgme_sign_result_t result;
   char *agent_info;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 
@@ -133,7 +135,3 @@ main (int argc, char **argv)
   gpgme_release (ctx);
   return 0;
 }
-
-
-
-

diff --git a/tests/gpg/t-signers.c b/tests/gpg/t-signers.c
index d74d44798f91fa8bc659b468fa850c8277c99576..f8288b49c91d0a820ad46403754cd29475c34d0f 100644 (file)
--- a/tests/gpg/t-signers.c
+++ b/tests/gpg/t-signers.c
@@ -96,6 +96,8 @@ main (int argc, char *argv[])
   gpgme_sign_result_t result;
   char *agent_info;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 

diff --git a/tests/gpg/t-support.h b/tests/gpg/t-support.h
index e9ea283d689ee022ae0429b14bb8783ff46d77fc..929a5d13fe279a3ec09e8fa1d0cce537b27a846f 100644 (file)
--- a/tests/gpg/t-support.h
+++ b/tests/gpg/t-support.h
@@ -20,6 +20,8 @@
 
 #include <unistd.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <locale.h>
 
 #include <gpgme.h>
 
@@ -79,3 +81,18 @@ make_filename (const char *fname)
   strcat (buf, fname);
   return buf;
 }
+
+
+void
+init_gpgme (gpgme_protocol_t proto)
+{
+  gpgme_error_t err;
+
+  gpgme_check_version (NULL);
+  setlocale (LC_ALL, "");
+  gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
+  gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
+
+  err = gpgme_engine_check_version (proto);
+  fail_if_err (err);
+}

diff --git a/tests/gpg/t-trustlist.c b/tests/gpg/t-trustlist.c
index db10cf0c3a96c11b6ce3fe18a0f4defff2abe582..c8c82f8245a039b7867344d8a2da683fcdf1cc9d 100644 (file)
--- a/tests/gpg/t-trustlist.c
+++ b/tests/gpg/t-trustlist.c
@@ -34,6 +34,8 @@ main (int argc, char *argv[])
   gpgme_error_t err;
   gpgme_trust_item_t item;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 

diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index b4912e3f4d6fc820eae30bb62bcdff1893d6e90f..83e942f0790945b177c2145b7fcdef396af5d40d 100644 (file)
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -151,6 +151,8 @@ main (int argc, char *argv[])
   gpgme_data_t sig, text;
   gpgme_verify_result_t result;
 
+  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
 

diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c
index 21d6bd14218b4552c3d25de36b0bc07b70523a60..ca5757dc7ebfd039fd9b7bfe2a175c0109814d4a 100644 (file)
--- a/tests/gpgsm/t-decrypt.c
+++ b/tests/gpgsm/t-decrypt.c
@@ -49,6 +49,8 @@ main (int argc, char *argv[])
   gpgme_data_t in, out;
   gpgme_decrypt_result_t result;
 
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
@@ -75,5 +77,3 @@ main (int argc, char *argv[])
   gpgme_release (ctx);
   return 0;
 }
-
-

diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 4da0f7277a89c0e2e9feb3333a54d5a55f230cf5..ff61394bb8e4d401c90d8af323d198b3adfa6219 100644 (file)
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -35,8 +35,7 @@ main (int argc, char **argv)
   gpgme_key_t key[] = { NULL, NULL };
   gpgme_encrypt_result_t result;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);

diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
index a2355e0c487c55bf739078dcaf267d860e074fce..ce7dadb8cfb5d4e32679f6389f2205f7066d0656 100644 (file)
--- a/tests/gpgsm/t-export.c
+++ b/tests/gpgsm/t-export.c
@@ -34,6 +34,9 @@ main (int argc, char *argv[])
   gpgme_error_t err;
   gpgme_data_t out;
   const char *pattern[] = { "DFN Top Level Certification Authority", NULL };
+
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);

diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c
index 8b08a65b1e577a7d000be18d662db24ad193d269..a4d60c1ecd814ddccb3d54e28d78210d368c422e 100644 (file)
--- a/tests/gpgsm/t-genkey.c
+++ b/tests/gpgsm/t-genkey.c
@@ -64,8 +64,7 @@ main (int argc, char *argv[])
   gpgme_genkey_result_t result;
   gpgme_data_t certreq;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_data_new (&certreq);
   fail_if_err (err);

diff --git a/tests/gpgsm/t-import.c b/tests/gpgsm/t-import.c
index 2b50e10e175940dbf216efa0dfe1752ddb444e7d..c9c31ffd0b7e4372c990f3515a3600f45e020b41 100644 (file)
--- a/tests/gpgsm/t-import.c
+++ b/tests/gpgsm/t-import.c
@@ -161,8 +161,7 @@ main (int argc, char **argv)
   const char *cert_1 = make_filename ("cert_dfn_pca01.der");
   const char *cert_2 = make_filename ("cert_dfn_pca15.der");
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);

diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index 7e5962834a578f19bbdae8ed0b85a219e3f5c296..b0249d1232f07fb6105f6b53ad30eafcd63306a4 100644 (file)
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -82,8 +82,7 @@ main (int argc, char **argv)
   gpgme_keylist_result_t result;
   int i = 0;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);

diff --git a/tests/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c
index 5fd6f069bd6544bbcd12ad0077c9c9f424e3fb75..2cfac7da02272d468d1bed81c09495e9dac66562 100644 (file)
--- a/tests/gpgsm/t-sign.c
+++ b/tests/gpgsm/t-sign.c
@@ -81,8 +81,7 @@ main (int argc, char *argv[])
   gpgme_data_t in, out;
   gpgme_sign_result_t result;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -119,7 +118,3 @@ main (int argc, char *argv[])
   gpgme_release (ctx);
   return 0;
 }
-
-
-
-

diff --git a/tests/gpgsm/t-support.h b/tests/gpgsm/t-support.h
index c64705153d5d91251c7f13080d0e4fa0cad9510f..3199b056e0d785fc3a1fa0bf9a4ae1b674c7d995 100644 (file)
--- a/tests/gpgsm/t-support.h
+++ b/tests/gpgsm/t-support.h
@@ -20,6 +20,8 @@
 
 #include <unistd.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <locale.h>
 
 #include <gpgme.h>
 
@@ -79,3 +81,18 @@ make_filename (const char *fname)
   strcat (buf, fname);
   return buf;
 }
+
+
+void
+init_gpgme (gpgme_protocol_t proto)
+{
+  gpgme_error_t err;
+
+  gpgme_check_version (NULL);
+  setlocale (LC_ALL, "");
+  gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
+  gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
+
+  err = gpgme_engine_check_version (proto);
+  fail_if_err (err);
+}

diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c
index be61cbb2299ddbea2936d73bd571349dd29aa752..c8913a91ef6ade4da80336a295c9aef27420646e 100644 (file)
--- a/tests/gpgsm/t-verify.c
+++ b/tests/gpgsm/t-verify.c
@@ -119,6 +119,8 @@ main (int argc, char **argv)
   gpgme_data_t sig, text;
   gpgme_verify_result_t result;
 
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
@@ -150,6 +152,3 @@ main (int argc, char **argv)
   gpgme_release (ctx);  
   return 0;
 }
-
-
-