From cvs at cvs.gnupg.org Sun Jan 1 18:48:56 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Sun Jan 1 18:11:23 2006 Subject: [svn] GnuPG - r3982 - trunk/g10 Message-ID: Author: dshaw Date: 2006-01-01 18:48:54 +0100 (Sun, 01 Jan 2006) New Revision: 3982 Modified: trunk/g10/ChangeLog trunk/g10/app-openpgp.c trunk/g10/sign.c Log: * sign.c (hash_for): Add code to detect if the sk lives on a smart card. If it does, only allow 160-bit hashes, a la DSA. This involves passing the *sk in, so change all callers. This is correct for today, given the current 160-bit q in DSA, and the current SHA-1/RIPEMD160 support in the openpgp card. It will almost certainly need changing down the road. * app-openpgp.c (do_sign): Give user error if hash algorithm is not supported by the card. Modified: trunk/g10/ChangeLog =================================================================== --- trunk/g10/ChangeLog 2005-12-24 15:35:39 UTC (rev 3981) +++ trunk/g10/ChangeLog 2006-01-01 17:48:54 UTC (rev 3982) @@ -1,3 +1,15 @@ +2006-01-01 David Shaw + + * sign.c (hash_for): Add code to detect if the sk lives on a smart + card. If it does, only allow 160-bit hashes, a la DSA. This + involves passing the *sk in, so change all callers. This is + correct for today, given the current 160-bit q in DSA, and the + current SHA-1/RIPEMD160 support in the openpgp card. It will + almost certainly need changing down the road. + + * app-openpgp.c (do_sign): Give user error if hash algorithm is + not supported by the card. + 2005-12-23 David Shaw * keyserver.c (keyserver_import_pka): New. Moved from Modified: trunk/g10/app-openpgp.c =================================================================== --- trunk/g10/app-openpgp.c 2005-12-24 15:35:39 UTC (rev 3981) +++ trunk/g10/app-openpgp.c 2006-01-01 17:48:54 UTC (rev 3982) @@ -2083,7 +2083,11 @@ && !memcmp (indata, rmd160_prefix, 15)) ; else - return gpg_error (GPG_ERR_INV_VALUE); + { + log_error(_("card does not support digest algorithm %s\n"), + digest_algo_to_string(hashalgo)); + return gpg_error (GPG_ERR_INV_VALUE); + } /* Check whether an OpenPGP card of any version has been requested. */ if (strlen (keyidstr) < 32 || strncmp (keyidstr, "D27600012401", 12)) Modified: trunk/g10/sign.c =================================================================== --- trunk/g10/sign.c 2005-12-24 15:35:39 UTC (rev 3981) +++ trunk/g10/sign.c 2006-01-01 17:48:54 UTC (rev 3982) @@ -407,21 +407,20 @@ */ static int -hash_for(int pubkey_algo, int packet_version ) +hash_for(PKT_secret_key *sk) { if( opt.def_digest_algo ) return opt.def_digest_algo; else if( recipient_digest_algo ) return recipient_digest_algo; - else if(PGP2 && pubkey_algo == PUBKEY_ALGO_RSA && packet_version < 4 ) + else if(sk->pubkey_algo==PUBKEY_ALGO_DSA + || (sk->is_protected && sk->protect.s2k.mode==1002)) { - /* Old-style PGP only understands MD5 */ - return DIGEST_ALGO_MD5; - } - else if( pubkey_algo == PUBKEY_ALGO_DSA ) - { - /* We need a 160-bit hash for DSA, so we can't just take the first - in the pref list */ + /* The sk lives on a smartcard, or it's a DSA key. DSA requires + a 160-bit hash, and current smartcards only handle SHA-1 and + RIPEMD/160 (i.e. 160-bit hashes). This is correct now, but + may need revision as the cards add algorithms and/or DSA is + expanded to use larger hashes. */ if(opt.personal_digest_prefs) { @@ -434,6 +433,11 @@ return DIGEST_ALGO_SHA1; } + else if(PGP2 && sk->pubkey_algo == PUBKEY_ALGO_RSA && sk->version < 4 ) + { + /* Old-style PGP only understands MD5 */ + return DIGEST_ALGO_MD5; + } else if( opt.personal_digest_prefs ) { /* It's not DSA, so we can use whatever the first hash algorithm @@ -511,7 +515,7 @@ sk = sk_rover->sk; ops = xmalloc_clear (sizeof *ops); ops->sig_class = sigclass; - ops->digest_algo = hash_for (sk->pubkey_algo, sk->version); + ops->digest_algo = hash_for (sk); ops->pubkey_algo = sk->pubkey_algo; keyid_from_sk (sk, ops->keyid); ops->last = (skcount == 1); @@ -651,7 +655,6 @@ else sig->version=sk->version; keyid_from_sk (sk, sig->keyid); - sig->digest_algo = hash_for (sk->pubkey_algo, sk->version); sig->pubkey_algo = sk->pubkey_algo; if(timestamp) sig->timestamp = timestamp; @@ -670,7 +673,7 @@ hash_sigversion_to_magic (md, sig); md_final (md); - rc = do_sign( sk, sig, md, hash_for (sig->pubkey_algo, sk->version) ); + rc = do_sign( sk, sig, md, hash_for (sk) ); md_close (md); if( !rc ) { /* and write it */ @@ -846,8 +849,14 @@ sk, but so long as there is only one signing algorithm with hash restrictions, this is ok. -dms */ + /* Current smartcards only do 160-bit hashes as well. + Note that this may well have to change as the cards add + algorithms. */ + for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) - if(sk_rover->sk->pubkey_algo==PUBKEY_ALGO_DSA) + if(sk_rover->sk->pubkey_algo==PUBKEY_ALGO_DSA + || (sk_rover->sk->is_protected + && sk_rover->sk->protect.s2k.mode==1002)) hashlen=20; if((algo= @@ -859,7 +868,7 @@ for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) { PKT_secret_key *sk = sk_rover->sk; - md_enable(mfx.md, hash_for(sk->pubkey_algo, sk->version )); + md_enable(mfx.md, hash_for(sk)); } if( !multifile ) @@ -1077,7 +1086,7 @@ for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) { PKT_secret_key *sk = sk_rover->sk; - if( hash_for(sk->pubkey_algo, sk->version) == DIGEST_ALGO_MD5 ) + if( hash_for(sk) == DIGEST_ALGO_MD5 ) only_md5 = 1; else { only_md5 = 0; @@ -1094,7 +1103,7 @@ iobuf_writestr(out, "Hash: " ); for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) { PKT_secret_key *sk = sk_rover->sk; - int i = hash_for(sk->pubkey_algo, sk->version); + int i = hash_for(sk); if( !hashs_seen[ i & 0xff ] ) { s = digest_algo_to_string( i ); @@ -1119,7 +1128,7 @@ textmd = md_open(0, 0); for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) { PKT_secret_key *sk = sk_rover->sk; - md_enable(textmd, hash_for(sk->pubkey_algo, sk->version)); + md_enable(textmd, hash_for(sk)); } if ( DBG_HASHING ) md_start_debug( textmd, "clearsign" ); @@ -1242,7 +1251,7 @@ for (sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next) { PKT_secret_key *sk = sk_rover->sk; - md_enable (mfx.md, hash_for (sk->pubkey_algo, sk->version )); + md_enable (mfx.md, hash_for (sk)); } iobuf_push_filter (inp, md_filter, &mfx); From cvs at cvs.gnupg.org Sun Jan 1 18:59:58 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Sun Jan 1 18:22:25 2006 Subject: [svn] GnuPG - r3983 - trunk/g10 Message-ID: Author: dshaw Date: 2006-01-01 18:59:57 +0100 (Sun, 01 Jan 2006) New Revision: 3983 Modified: trunk/g10/ChangeLog trunk/g10/sign.c Log: * sign.c (write_signature_packets): Lost a digest_algo line. Modified: trunk/g10/ChangeLog =================================================================== --- trunk/g10/ChangeLog 2006-01-01 17:48:54 UTC (rev 3982) +++ trunk/g10/ChangeLog 2006-01-01 17:59:57 UTC (rev 3983) @@ -1,5 +1,7 @@ 2006-01-01 David Shaw + * sign.c (write_signature_packets): Lost a digest_algo line. + * sign.c (hash_for): Add code to detect if the sk lives on a smart card. If it does, only allow 160-bit hashes, a la DSA. This involves passing the *sk in, so change all callers. This is Modified: trunk/g10/sign.c =================================================================== --- trunk/g10/sign.c 2006-01-01 17:48:54 UTC (rev 3982) +++ trunk/g10/sign.c 2006-01-01 17:59:57 UTC (rev 3983) @@ -655,6 +655,7 @@ else sig->version=sk->version; keyid_from_sk (sk, sig->keyid); + sig->digest_algo = hash_for(sk); sig->pubkey_algo = sk->pubkey_algo; if(timestamp) sig->timestamp = timestamp; From cvs at cvs.gnupg.org Sun Jan 1 19:12:58 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Sun Jan 1 18:35:31 2006 Subject: [svn] GnuPG - r3984 - trunk/g10 Message-ID: Author: dshaw Date: 2006-01-01 19:12:57 +0100 (Sun, 01 Jan 2006) New Revision: 3984 Modified: trunk/g10/ChangeLog trunk/g10/card-util.c trunk/g10/keyserver.c trunk/g10/mainproc.c Log: * mainproc.c (check_sig_and_print), keyserver.c (keyserver_import_pka), card-util.c (fetch_url): Always require a scheme:// for keyserver URLs except when used as part of the --keyserver command for backwards compatibility. Modified: trunk/g10/ChangeLog =================================================================== --- trunk/g10/ChangeLog 2006-01-01 17:59:57 UTC (rev 3983) +++ trunk/g10/ChangeLog 2006-01-01 18:12:57 UTC (rev 3984) @@ -1,5 +1,10 @@ 2006-01-01 David Shaw + * mainproc.c (check_sig_and_print), keyserver.c + (keyserver_import_pka), card-util.c (fetch_url): Always require a + scheme:// for keyserver URLs except when used as part of the + --keyserver command for backwards compatibility. + * sign.c (write_signature_packets): Lost a digest_algo line. * sign.c (hash_for): Add code to detect if the sk lives on a smart Modified: trunk/g10/card-util.c =================================================================== --- trunk/g10/card-util.c 2006-01-01 17:59:57 UTC (rev 3983) +++ trunk/g10/card-util.c 2006-01-01 18:12:57 UTC (rev 3984) @@ -623,7 +623,7 @@ gpg_strerror(rc)); else if (info.pubkey_url && *info.pubkey_url) { - spec=parse_keyserver_uri(info.pubkey_url,0,NULL,0); + spec=parse_keyserver_uri(info.pubkey_url,1,NULL,0); if(spec && info.fpr1valid) { /* This is not perfectly right. Currently, all card Modified: trunk/g10/keyserver.c =================================================================== --- trunk/g10/keyserver.c 2006-01-01 17:59:57 UTC (rev 3983) +++ trunk/g10/keyserver.c 2006-01-01 18:12:57 UTC (rev 3984) @@ -1979,7 +1979,7 @@ if (uri) { struct keyserver_spec *spec; - spec = parse_keyserver_uri (uri, 0, NULL, 0); + spec = parse_keyserver_uri (uri, 1, NULL, 0); if (spec) { rc=keyserver_import_fprint (fpr, 20, spec); Modified: trunk/g10/mainproc.c =================================================================== --- trunk/g10/mainproc.c 2006-01-01 17:59:57 UTC (rev 3983) +++ trunk/g10/mainproc.c 2006-01-01 18:12:57 UTC (rev 3984) @@ -1529,7 +1529,7 @@ int res; struct keyserver_spec *spec; - spec = parse_keyserver_uri (uri, 0, NULL, 0); + spec = parse_keyserver_uri (uri, 1, NULL, 0); if (spec) { glo_ctrl.in_auto_key_retrieve++; From cvs at cvs.gnupg.org Mon Jan 2 09:51:35 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Mon Jan 2 09:14:05 2006 Subject: [svn] GPGol - r135 - trunk/src Message-ID: Author: wk Date: 2006-01-02 09:51:34 +0100 (Mon, 02 Jan 2006) New Revision: 135 Added: trunk/src/w32-gettext.c trunk/src/w32-gettext.h Log: Add missing files Added: trunk/src/w32-gettext.c =================================================================== --- trunk/src/w32-gettext.c 2005-12-07 17:16:53 UTC (rev 134) +++ trunk/src/w32-gettext.c 2006-01-02 08:51:34 UTC (rev 135) @@ -0,0 +1,1721 @@ +/* w32-gettext.h - A simple gettext implementation for Windows targets. + Copyright (C) 1995,1996,1997,1999,2005 Free Software Foundation, Inc. + Copyright (C) 2005 g10 Code GmbH + + This file is part of libgpg-error. + + libgpg-error is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + as published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + libgpg-error 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with libgpg-error; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +#if HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "w32-gettext.h" + + +/* localname.c from gettext. */ + +/* Edit: Added a "static" to _nl_locale_name. Note that the category + argument is ignored on w32. */ + +/* Determine the current selected locale. + Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library 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. */ + +/* Written by Ulrich Drepper , 1995. */ +/* Win32 code written by Tor Lillqvist . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + +#ifdef HAVE_W32_SYSTEM +# include +/* List of language codes, sorted by value: + 0x01 LANG_ARABIC + 0x02 LANG_BULGARIAN + 0x03 LANG_CATALAN + 0x04 LANG_CHINESE + 0x05 LANG_CZECH + 0x06 LANG_DANISH + 0x07 LANG_GERMAN + 0x08 LANG_GREEK + 0x09 LANG_ENGLISH + 0x0a LANG_SPANISH + 0x0b LANG_FINNISH + 0x0c LANG_FRENCH + 0x0d LANG_HEBREW + 0x0e LANG_HUNGARIAN + 0x0f LANG_ICELANDIC + 0x10 LANG_ITALIAN + 0x11 LANG_JAPANESE + 0x12 LANG_KOREAN + 0x13 LANG_DUTCH + 0x14 LANG_NORWEGIAN + 0x15 LANG_POLISH + 0x16 LANG_PORTUGUESE + 0x17 LANG_RHAETO_ROMANCE + 0x18 LANG_ROMANIAN + 0x19 LANG_RUSSIAN + 0x1a LANG_CROATIAN == LANG_SERBIAN + 0x1b LANG_SLOVAK + 0x1c LANG_ALBANIAN + 0x1d LANG_SWEDISH + 0x1e LANG_THAI + 0x1f LANG_TURKISH + 0x20 LANG_URDU + 0x21 LANG_INDONESIAN + 0x22 LANG_UKRAINIAN + 0x23 LANG_BELARUSIAN + 0x24 LANG_SLOVENIAN + 0x25 LANG_ESTONIAN + 0x26 LANG_LATVIAN + 0x27 LANG_LITHUANIAN + 0x28 LANG_TAJIK + 0x29 LANG_FARSI + 0x2a LANG_VIETNAMESE + 0x2b LANG_ARMENIAN + 0x2c LANG_AZERI + 0x2d LANG_BASQUE + 0x2e LANG_SORBIAN + 0x2f LANG_MACEDONIAN + 0x30 LANG_SUTU + 0x31 LANG_TSONGA + 0x32 LANG_TSWANA + 0x33 LANG_VENDA + 0x34 LANG_XHOSA + 0x35 LANG_ZULU + 0x36 LANG_AFRIKAANS + 0x37 LANG_GEORGIAN + 0x38 LANG_FAEROESE + 0x39 LANG_HINDI + 0x3a LANG_MALTESE + 0x3b LANG_SAAMI + 0x3c LANG_GAELIC + 0x3d LANG_YIDDISH + 0x3e LANG_MALAY + 0x3f LANG_KAZAK + 0x40 LANG_KYRGYZ + 0x41 LANG_SWAHILI + 0x42 LANG_TURKMEN + 0x43 LANG_UZBEK + 0x44 LANG_TATAR + 0x45 LANG_BENGALI + 0x46 LANG_PUNJABI + 0x47 LANG_GUJARATI + 0x48 LANG_ORIYA + 0x49 LANG_TAMIL + 0x4a LANG_TELUGU + 0x4b LANG_KANNADA + 0x4c LANG_MALAYALAM + 0x4d LANG_ASSAMESE + 0x4e LANG_MARATHI + 0x4f LANG_SANSKRIT + 0x50 LANG_MONGOLIAN + 0x51 LANG_TIBETAN + 0x52 LANG_WELSH + 0x53 LANG_CAMBODIAN + 0x54 LANG_LAO + 0x55 LANG_BURMESE + 0x56 LANG_GALICIAN + 0x57 LANG_KONKANI + 0x58 LANG_MANIPURI + 0x59 LANG_SINDHI + 0x5a LANG_SYRIAC + 0x5b LANG_SINHALESE + 0x5c LANG_CHEROKEE + 0x5d LANG_INUKTITUT + 0x5e LANG_AMHARIC + 0x5f LANG_TAMAZIGHT + 0x60 LANG_KASHMIRI + 0x61 LANG_NEPALI + 0x62 LANG_FRISIAN + 0x63 LANG_PASHTO + 0x64 LANG_TAGALOG + 0x65 LANG_DIVEHI + 0x66 LANG_EDO + 0x67 LANG_FULFULDE + 0x68 LANG_HAUSA + 0x69 LANG_IBIBIO + 0x6a LANG_YORUBA + 0x70 LANG_IGBO + 0x71 LANG_KANURI + 0x72 LANG_OROMO + 0x73 LANG_TIGRINYA + 0x74 LANG_GUARANI + 0x75 LANG_HAWAIIAN + 0x76 LANG_LATIN + 0x77 LANG_SOMALI + 0x78 LANG_YI + 0x79 LANG_PAPIAMENTU +*/ +/* Mingw headers don't have latest language and sublanguage codes. */ +# ifndef LANG_AFRIKAANS +# define LANG_AFRIKAANS 0x36 +# endif +# ifndef LANG_ALBANIAN +# define LANG_ALBANIAN 0x1c +# endif +# ifndef LANG_AMHARIC +# define LANG_AMHARIC 0x5e +# endif +# ifndef LANG_ARABIC +# define LANG_ARABIC 0x01 +# endif +# ifndef LANG_ARMENIAN +# define LANG_ARMENIAN 0x2b +# endif +# ifndef LANG_ASSAMESE +# define LANG_ASSAMESE 0x4d +# endif +# ifndef LANG_AZERI +# define LANG_AZERI 0x2c +# endif +# ifndef LANG_BASQUE +# define LANG_BASQUE 0x2d +# endif +# ifndef LANG_BELARUSIAN +# define LANG_BELARUSIAN 0x23 +# endif +# ifndef LANG_BENGALI +# define LANG_BENGALI 0x45 +# endif +# ifndef LANG_BURMESE +# define LANG_BURMESE 0x55 +# endif +# ifndef LANG_CAMBODIAN +# define LANG_CAMBODIAN 0x53 +# endif +# ifndef LANG_CATALAN +# define LANG_CATALAN 0x03 +# endif +# ifndef LANG_CHEROKEE +# define LANG_CHEROKEE 0x5c +# endif +# ifndef LANG_DIVEHI +# define LANG_DIVEHI 0x65 +# endif +# ifndef LANG_EDO +# define LANG_EDO 0x66 +# endif +# ifndef LANG_ESTONIAN +# define LANG_ESTONIAN 0x25 +# endif +# ifndef LANG_FAEROESE +# define LANG_FAEROESE 0x38 +# endif +# ifndef LANG_FARSI +# define LANG_FARSI 0x29 +# endif +# ifndef LANG_FRISIAN +# define LANG_FRISIAN 0x62 +# endif +# ifndef LANG_FULFULDE +# define LANG_FULFULDE 0x67 +# endif +# ifndef LANG_GAELIC +# define LANG_GAELIC 0x3c +# endif +# ifndef LANG_GALICIAN +# define LANG_GALICIAN 0x56 +# endif +# ifndef LANG_GEORGIAN +# define LANG_GEORGIAN 0x37 +# endif +# ifndef LANG_GUARANI +# define LANG_GUARANI 0x74 +# endif +# ifndef LANG_GUJARATI +# define LANG_GUJARATI 0x47 +# endif +# ifndef LANG_HAUSA +# define LANG_HAUSA 0x68 +# endif +# ifndef LANG_HAWAIIAN +# define LANG_HAWAIIAN 0x75 +# endif +# ifndef LANG_HEBREW +# define LANG_HEBREW 0x0d +# endif +# ifndef LANG_HINDI +# define LANG_HINDI 0x39 +# endif +# ifndef LANG_IBIBIO +# define LANG_IBIBIO 0x69 +# endif +# ifndef LANG_IGBO +# define LANG_IGBO 0x70 +# endif +# ifndef LANG_INDONESIAN +# define LANG_INDONESIAN 0x21 +# endif +# ifndef LANG_INUKTITUT +# define LANG_INUKTITUT 0x5d +# endif +# ifndef LANG_KANNADA +# define LANG_KANNADA 0x4b +# endif +# ifndef LANG_KANURI +# define LANG_KANURI 0x71 +# endif +# ifndef LANG_KASHMIRI +# define LANG_KASHMIRI 0x60 +# endif +# ifndef LANG_KAZAK +# define LANG_KAZAK 0x3f +# endif +# ifndef LANG_KONKANI +# define LANG_KONKANI 0x57 +# endif +# ifndef LANG_KYRGYZ +# define LANG_KYRGYZ 0x40 +# endif +# ifndef LANG_LAO +# define LANG_LAO 0x54 +# endif +# ifndef LANG_LATIN +# define LANG_LATIN 0x76 +# endif +# ifndef LANG_LATVIAN +# define LANG_LATVIAN 0x26 +# endif +# ifndef LANG_LITHUANIAN +# define LANG_LITHUANIAN 0x27 +# endif +# ifndef LANG_MACEDONIAN +# define LANG_MACEDONIAN 0x2f +# endif +# ifndef LANG_MALAY +# define LANG_MALAY 0x3e +# endif +# ifndef LANG_MALAYALAM +# define LANG_MALAYALAM 0x4c +# endif +# ifndef LANG_MALTESE +# define LANG_MALTESE 0x3a +# endif +# ifndef LANG_MANIPURI +# define LANG_MANIPURI 0x58 +# endif +# ifndef LANG_MARATHI +# define LANG_MARATHI 0x4e +# endif +# ifndef LANG_MONGOLIAN +# define LANG_MONGOLIAN 0x50 +# endif +# ifndef LANG_NEPALI +# define LANG_NEPALI 0x61 +# endif +# ifndef LANG_ORIYA +# define LANG_ORIYA 0x48 +# endif +# ifndef LANG_OROMO +# define LANG_OROMO 0x72 +# endif +# ifndef LANG_PAPIAMENTU +# define LANG_PAPIAMENTU 0x79 +# endif +# ifndef LANG_PASHTO +# define LANG_PASHTO 0x63 +# endif +# ifndef LANG_PUNJABI +# define LANG_PUNJABI 0x46 +# endif +# ifndef LANG_RHAETO_ROMANCE +# define LANG_RHAETO_ROMANCE 0x17 +# endif +# ifndef LANG_SAAMI +# define LANG_SAAMI 0x3b +# endif +# ifndef LANG_SANSKRIT +# define LANG_SANSKRIT 0x4f +# endif +# ifndef LANG_SERBIAN +# define LANG_SERBIAN 0x1a +# endif +# ifndef LANG_SINDHI +# define LANG_SINDHI 0x59 +# endif +# ifndef LANG_SINHALESE +# define LANG_SINHALESE 0x5b +# endif +# ifndef LANG_SLOVAK +# define LANG_SLOVAK 0x1b +# endif +# ifndef LANG_SOMALI +# define LANG_SOMALI 0x77 +# endif +# ifndef LANG_SORBIAN +# define LANG_SORBIAN 0x2e +# endif +# ifndef LANG_SUTU +# define LANG_SUTU 0x30 +# endif +# ifndef LANG_SWAHILI +# define LANG_SWAHILI 0x41 +# endif +# ifndef LANG_SYRIAC +# define LANG_SYRIAC 0x5a +# endif +# ifndef LANG_TAGALOG +# define LANG_TAGALOG 0x64 +# endif +# ifndef LANG_TAJIK +# define LANG_TAJIK 0x28 +# endif +# ifndef LANG_TAMAZIGHT +# define LANG_TAMAZIGHT 0x5f +# endif +# ifndef LANG_TAMIL +# define LANG_TAMIL 0x49 +# endif +# ifndef LANG_TATAR +# define LANG_TATAR 0x44 +# endif +# ifndef LANG_TELUGU +# define LANG_TELUGU 0x4a +# endif +# ifndef LANG_THAI +# define LANG_THAI 0x1e +# endif +# ifndef LANG_TIBETAN +# define LANG_TIBETAN 0x51 +# endif +# ifndef LANG_TIGRINYA +# define LANG_TIGRINYA 0x73 +# endif +# ifndef LANG_TSONGA +# define LANG_TSONGA 0x31 +# endif +# ifndef LANG_TSWANA +# define LANG_TSWANA 0x32 +# endif +# ifndef LANG_TURKMEN +# define LANG_TURKMEN 0x42 +# endif +# ifndef LANG_UKRAINIAN +# define LANG_UKRAINIAN 0x22 +# endif +# ifndef LANG_URDU +# define LANG_URDU 0x20 +# endif +# ifndef LANG_UZBEK +# define LANG_UZBEK 0x43 +# endif +# ifndef LANG_VENDA +# define LANG_VENDA 0x33 +# endif +# ifndef LANG_VIETNAMESE +# define LANG_VIETNAMESE 0x2a +# endif +# ifndef LANG_WELSH +# define LANG_WELSH 0x52 +# endif +# ifndef LANG_XHOSA +# define LANG_XHOSA 0x34 +# endif +# ifndef LANG_YI +# define LANG_YI 0x78 +# endif +# ifndef LANG_YIDDISH +# define LANG_YIDDISH 0x3d +# endif +# ifndef LANG_YORUBA +# define LANG_YORUBA 0x6a +# endif +# ifndef LANG_ZULU +# define LANG_ZULU 0x35 +# endif +# ifndef SUBLANG_ARABIC_SAUDI_ARABIA +# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 +# endif +# ifndef SUBLANG_ARABIC_IRAQ +# define SUBLANG_ARABIC_IRAQ 0x02 +# endif +# ifndef SUBLANG_ARABIC_EGYPT +# define SUBLANG_ARABIC_EGYPT 0x03 +# endif +# ifndef SUBLANG_ARABIC_LIBYA +# define SUBLANG_ARABIC_LIBYA 0x04 +# endif +# ifndef SUBLANG_ARABIC_ALGERIA +# define SUBLANG_ARABIC_ALGERIA 0x05 +# endif +# ifndef SUBLANG_ARABIC_MOROCCO +# define SUBLANG_ARABIC_MOROCCO 0x06 +# endif +# ifndef SUBLANG_ARABIC_TUNISIA +# define SUBLANG_ARABIC_TUNISIA 0x07 +# endif +# ifndef SUBLANG_ARABIC_OMAN +# define SUBLANG_ARABIC_OMAN 0x08 +# endif +# ifndef SUBLANG_ARABIC_YEMEN +# define SUBLANG_ARABIC_YEMEN 0x09 +# endif +# ifndef SUBLANG_ARABIC_SYRIA +# define SUBLANG_ARABIC_SYRIA 0x0a +# endif +# ifndef SUBLANG_ARABIC_JORDAN +# define SUBLANG_ARABIC_JORDAN 0x0b +# endif +# ifndef SUBLANG_ARABIC_LEBANON +# define SUBLANG_ARABIC_LEBANON 0x0c +# endif +# ifndef SUBLANG_ARABIC_KUWAIT +# define SUBLANG_ARABIC_KUWAIT 0x0d +# endif +# ifndef SUBLANG_ARABIC_UAE +# define SUBLANG_ARABIC_UAE 0x0e +# endif +# ifndef SUBLANG_ARABIC_BAHRAIN +# define SUBLANG_ARABIC_BAHRAIN 0x0f +# endif +# ifndef SUBLANG_ARABIC_QATAR +# define SUBLANG_ARABIC_QATAR 0x10 +# endif +# ifndef SUBLANG_AZERI_LATIN +# define SUBLANG_AZERI_LATIN 0x01 +# endif +# ifndef SUBLANG_AZERI_CYRILLIC +# define SUBLANG_AZERI_CYRILLIC 0x02 +# endif +# ifndef SUBLANG_BENGALI_INDIA +# define SUBLANG_BENGALI_INDIA 0x00 +# endif +# ifndef SUBLANG_BENGALI_BANGLADESH +# define SUBLANG_BENGALI_BANGLADESH 0x01 +# endif +# ifndef SUBLANG_CHINESE_MACAU +# define SUBLANG_CHINESE_MACAU 0x05 +# endif +# ifndef SUBLANG_ENGLISH_SOUTH_AFRICA +# define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 +# endif +# ifndef SUBLANG_ENGLISH_JAMAICA +# define SUBLANG_ENGLISH_JAMAICA 0x08 +# endif +# ifndef SUBLANG_ENGLISH_CARIBBEAN +# define SUBLANG_ENGLISH_CARIBBEAN 0x09 +# endif +# ifndef SUBLANG_ENGLISH_BELIZE +# define SUBLANG_ENGLISH_BELIZE 0x0a +# endif +# ifndef SUBLANG_ENGLISH_TRINIDAD +# define SUBLANG_ENGLISH_TRINIDAD 0x0b +# endif +# ifndef SUBLANG_ENGLISH_ZIMBABWE +# define SUBLANG_ENGLISH_ZIMBABWE 0x0c +# endif +# ifndef SUBLANG_ENGLISH_PHILIPPINES +# define SUBLANG_ENGLISH_PHILIPPINES 0x0d +# endif +# ifndef SUBLANG_ENGLISH_INDONESIA +# define SUBLANG_ENGLISH_INDONESIA 0x0e +# endif +# ifndef SUBLANG_ENGLISH_HONGKONG +# define SUBLANG_ENGLISH_HONGKONG 0x0f +# endif +# ifndef SUBLANG_ENGLISH_INDIA +# define SUBLANG_ENGLISH_INDIA 0x10 +# endif +# ifndef SUBLANG_ENGLISH_MALAYSIA +# define SUBLANG_ENGLISH_MALAYSIA 0x11 +# endif +# ifndef SUBLANG_ENGLISH_SINGAPORE +# define SUBLANG_ENGLISH_SINGAPORE 0x12 +# endif +# ifndef SUBLANG_FRENCH_LUXEMBOURG +# define SUBLANG_FRENCH_LUXEMBOURG 0x05 +# endif +# ifndef SUBLANG_FRENCH_MONACO +# define SUBLANG_FRENCH_MONACO 0x06 +# endif +# ifndef SUBLANG_FRENCH_WESTINDIES +# define SUBLANG_FRENCH_WESTINDIES 0x07 +# endif +# ifndef SUBLANG_FRENCH_REUNION +# define SUBLANG_FRENCH_REUNION 0x08 +# endif +# ifndef SUBLANG_FRENCH_CONGO +# define SUBLANG_FRENCH_CONGO 0x09 +# endif +# ifndef SUBLANG_FRENCH_SENEGAL +# define SUBLANG_FRENCH_SENEGAL 0x0a +# endif +# ifndef SUBLANG_FRENCH_CAMEROON +# define SUBLANG_FRENCH_CAMEROON 0x0b +# endif +# ifndef SUBLANG_FRENCH_COTEDIVOIRE +# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c +# endif +# ifndef SUBLANG_FRENCH_MALI +# define SUBLANG_FRENCH_MALI 0x0d +# endif +# ifndef SUBLANG_FRENCH_MOROCCO +# define SUBLANG_FRENCH_MOROCCO 0x0e +# endif +# ifndef SUBLANG_FRENCH_HAITI +# define SUBLANG_FRENCH_HAITI 0x0f +# endif +# ifndef SUBLANG_GERMAN_LUXEMBOURG +# define SUBLANG_GERMAN_LUXEMBOURG 0x04 +# endif +# ifndef SUBLANG_GERMAN_LIECHTENSTEIN +# define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 +# endif +# ifndef SUBLANG_KASHMIRI_INDIA +# define SUBLANG_KASHMIRI_INDIA 0x02 +# endif +# ifndef SUBLANG_MALAY_MALAYSIA +# define SUBLANG_MALAY_MALAYSIA 0x01 +# endif +# ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM +# define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 +# endif +# ifndef SUBLANG_NEPALI_INDIA +# define SUBLANG_NEPALI_INDIA 0x02 +# endif +# ifndef SUBLANG_PUNJABI_INDIA +# define SUBLANG_PUNJABI_INDIA 0x00 +# endif +# ifndef SUBLANG_PUNJABI_PAKISTAN +# define SUBLANG_PUNJABI_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_ROMANIAN_ROMANIA +# define SUBLANG_ROMANIAN_ROMANIA 0x00 +# endif +# ifndef SUBLANG_ROMANIAN_MOLDOVA +# define SUBLANG_ROMANIAN_MOLDOVA 0x01 +# endif +# ifndef SUBLANG_SERBIAN_LATIN +# define SUBLANG_SERBIAN_LATIN 0x02 +# endif +# ifndef SUBLANG_SERBIAN_CYRILLIC +# define SUBLANG_SERBIAN_CYRILLIC 0x03 +# endif +# ifndef SUBLANG_SINDHI_INDIA +# define SUBLANG_SINDHI_INDIA 0x00 +# endif +# ifndef SUBLANG_SINDHI_PAKISTAN +# define SUBLANG_SINDHI_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_SPANISH_GUATEMALA +# define SUBLANG_SPANISH_GUATEMALA 0x04 +# endif +# ifndef SUBLANG_SPANISH_COSTA_RICA +# define SUBLANG_SPANISH_COSTA_RICA 0x05 +# endif +# ifndef SUBLANG_SPANISH_PANAMA +# define SUBLANG_SPANISH_PANAMA 0x06 +# endif +# ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC +# define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 +# endif +# ifndef SUBLANG_SPANISH_VENEZUELA +# define SUBLANG_SPANISH_VENEZUELA 0x08 +# endif +# ifndef SUBLANG_SPANISH_COLOMBIA +# define SUBLANG_SPANISH_COLOMBIA 0x09 +# endif +# ifndef SUBLANG_SPANISH_PERU +# define SUBLANG_SPANISH_PERU 0x0a +# endif +# ifndef SUBLANG_SPANISH_ARGENTINA +# define SUBLANG_SPANISH_ARGENTINA 0x0b +# endif +# ifndef SUBLANG_SPANISH_ECUADOR +# define SUBLANG_SPANISH_ECUADOR 0x0c +# endif +# ifndef SUBLANG_SPANISH_CHILE +# define SUBLANG_SPANISH_CHILE 0x0d +# endif +# ifndef SUBLANG_SPANISH_URUGUAY +# define SUBLANG_SPANISH_URUGUAY 0x0e +# endif +# ifndef SUBLANG_SPANISH_PARAGUAY +# define SUBLANG_SPANISH_PARAGUAY 0x0f +# endif +# ifndef SUBLANG_SPANISH_BOLIVIA +# define SUBLANG_SPANISH_BOLIVIA 0x10 +# endif +# ifndef SUBLANG_SPANISH_EL_SALVADOR +# define SUBLANG_SPANISH_EL_SALVADOR 0x11 +# endif +# ifndef SUBLANG_SPANISH_HONDURAS +# define SUBLANG_SPANISH_HONDURAS 0x12 +# endif +# ifndef SUBLANG_SPANISH_NICARAGUA +# define SUBLANG_SPANISH_NICARAGUA 0x13 +# endif +# ifndef SUBLANG_SPANISH_PUERTO_RICO +# define SUBLANG_SPANISH_PUERTO_RICO 0x14 +# endif +# ifndef SUBLANG_SWEDISH_FINLAND +# define SUBLANG_SWEDISH_FINLAND 0x02 +# endif +# ifndef SUBLANG_TAMAZIGHT_ARABIC +# define SUBLANG_TAMAZIGHT_ARABIC 0x01 +# endif +# ifndef SUBLANG_TAMAZIGHT_LATIN +# define SUBLANG_TAMAZIGHT_LATIN 0x02 +# endif +# ifndef SUBLANG_TIGRINYA_ETHIOPIA +# define SUBLANG_TIGRINYA_ETHIOPIA 0x00 +# endif +# ifndef SUBLANG_TIGRINYA_ERITREA +# define SUBLANG_TIGRINYA_ERITREA 0x01 +# endif +# ifndef SUBLANG_URDU_PAKISTAN +# define SUBLANG_URDU_PAKISTAN 0x01 +# endif +# ifndef SUBLANG_URDU_INDIA +# define SUBLANG_URDU_INDIA 0x02 +# endif +# ifndef SUBLANG_UZBEK_LATIN +# define SUBLANG_UZBEK_LATIN 0x01 +# endif +# ifndef SUBLANG_UZBEK_CYRILLIC +# define SUBLANG_UZBEK_CYRILLIC 0x02 +# endif +#endif /* HAVE_W32_SYSTEM */ + +/* XPG3 defines the result of 'setlocale (category, NULL)' as: + "Directs 'setlocale()' to query 'category' and return the current + setting of 'local'." + However it does not specify the exact format. Neither do SUSV2 and + ISO C 99. So we can use this feature only on selected systems (e.g. + those using GNU C Library). */ +#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) +# define HAVE_LOCALE_NULL +#endif + +/* Determine the current locale's name, and canonicalize it into XPG syntax + language[_territory[.codeset]][@modifier] + The codeset part in the result is not reliable; the locale_charset() + should be used for codeset information instead. + The result must not be freed; it is statically allocated. */ + +static const char * +_nl_locale_name (int category, const char *categoryname) +{ + const char *retval; + +#ifndef HAVE_W32_SYSTEM + + /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. + On some systems this can be done by the 'setlocale' function itself. */ +# if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL + retval = setlocale (category, NULL); +# else + /* Setting of LC_ALL overwrites all other. */ + retval = getenv ("LC_ALL"); + if (retval == NULL || retval[0] == '\0') + { + /* Next comes the name of the desired category. */ + retval = getenv (categoryname); + if (retval == NULL || retval[0] == '\0') + { + /* Last possibility is the LANG environment variable. */ + retval = getenv ("LANG"); + if (retval == NULL || retval[0] == '\0') + /* We use C as the default domain. POSIX says this is + implementation defined. */ + retval = "C"; + } + } +# endif + + return retval; + +#else /* HAVE_W32_SYSTEM */ + + /* Return an XPG style locale name language[_territory][@modifier]. + Don't even bother determining the codeset; it's not useful in this + context, because message catalogs are not specific to a single + codeset. */ + + LCID lcid; + LANGID langid; + int primary, sub; + + /* Let the user override the system settings through environment + variables, as on POSIX systems. */ + retval = getenv ("LC_ALL"); + if (retval != NULL && retval[0] != '\0') + return retval; + retval = getenv (categoryname); + if (retval != NULL && retval[0] != '\0') + return retval; + retval = getenv ("LANG"); + if (retval != NULL && retval[0] != '\0') + return retval; + + /* Use native Win32 API locale ID. */ + lcid = GetThreadLocale (); + + /* Strip off the sorting rules, keep only the language part. */ + langid = LANGIDFROMLCID (lcid); + + /* Split into language and territory part. */ + primary = PRIMARYLANGID (langid); + sub = SUBLANGID (langid); + + /* Dispatch on language. + See also http://www.unicode.org/unicode/onlinedat/languages.html . + For details about languages, see http://www.ethnologue.com/ . */ + switch (primary) + { + case LANG_AFRIKAANS: return "af_ZA"; + case LANG_ALBANIAN: return "sq_AL"; + case LANG_AMHARIC: return "am_ET"; + case LANG_ARABIC: + switch (sub) + { + case SUBLANG_ARABIC_SAUDI_ARABIA: return "ar_SA"; + case SUBLANG_ARABIC_IRAQ: return "ar_IQ"; + case SUBLANG_ARABIC_EGYPT: return "ar_EG"; + case SUBLANG_ARABIC_LIBYA: return "ar_LY"; + case SUBLANG_ARABIC_ALGERIA: return "ar_DZ"; + case SUBLANG_ARABIC_MOROCCO: return "ar_MA"; + case SUBLANG_ARABIC_TUNISIA: return "ar_TN"; + case SUBLANG_ARABIC_OMAN: return "ar_OM"; + case SUBLANG_ARABIC_YEMEN: return "ar_YE"; + case SUBLANG_ARABIC_SYRIA: return "ar_SY"; + case SUBLANG_ARABIC_JORDAN: return "ar_JO"; + case SUBLANG_ARABIC_LEBANON: return "ar_LB"; + case SUBLANG_ARABIC_KUWAIT: return "ar_KW"; + case SUBLANG_ARABIC_UAE: return "ar_AE"; + case SUBLANG_ARABIC_BAHRAIN: return "ar_BH"; + case SUBLANG_ARABIC_QATAR: return "ar_QA"; + } + return "ar"; + case LANG_ARMENIAN: return "hy_AM"; + case LANG_ASSAMESE: return "as_IN"; + case LANG_AZERI: + switch (sub) + { + /* FIXME: Adjust this when Azerbaijani locales appear on Unix. */ + case SUBLANG_AZERI_LATIN: return "az_AZ@latin"; + case SUBLANG_AZERI_CYRILLIC: return "az_AZ@cyrillic"; + } + return "az"; + case LANG_BASQUE: + return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */ + case LANG_BELARUSIAN: return "be_BY"; + case LANG_BENGALI: + switch (sub) + { + case SUBLANG_BENGALI_INDIA: return "bn_IN"; + case SUBLANG_BENGALI_BANGLADESH: return "bn_BD"; + } + return "bn"; + case LANG_BULGARIAN: return "bg_BG"; + case LANG_BURMESE: return "my_MM"; + case LANG_CAMBODIAN: return "km_KH"; + case LANG_CATALAN: return "ca_ES"; + case LANG_CHEROKEE: return "chr_US"; + case LANG_CHINESE: + switch (sub) + { + case SUBLANG_CHINESE_TRADITIONAL: return "zh_TW"; + case SUBLANG_CHINESE_SIMPLIFIED: return "zh_CN"; + case SUBLANG_CHINESE_HONGKONG: return "zh_HK"; + case SUBLANG_CHINESE_SINGAPORE: return "zh_SG"; + case SUBLANG_CHINESE_MACAU: return "zh_MO"; + } + return "zh"; + case LANG_CROATIAN: /* LANG_CROATIAN == LANG_SERBIAN + * What used to be called Serbo-Croatian + * should really now be two separate + * languages because of political reasons. + * (Says tml, who knows nothing about Serbian + * or Croatian.) + * (I can feel those flames coming already.) + */ + switch (sub) + { + case SUBLANG_DEFAULT: return "hr_HR"; + case SUBLANG_SERBIAN_LATIN: return "sr_CS"; + case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic"; + } + return "hr"; + case LANG_CZECH: return "cs_CZ"; + case LANG_DANISH: return "da_DK"; + case LANG_DIVEHI: return "div_MV"; + case LANG_DUTCH: + switch (sub) + { + case SUBLANG_DUTCH: return "nl_NL"; + case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE"; + } + return "nl"; + case LANG_EDO: return "bin_NG"; + case LANG_ENGLISH: + switch (sub) + { + /* SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. Heh. I thought + * English was the language spoken in England. + * Oh well. + */ + case SUBLANG_ENGLISH_US: return "en_US"; + case SUBLANG_ENGLISH_UK: return "en_GB"; + case SUBLANG_ENGLISH_AUS: return "en_AU"; + case SUBLANG_ENGLISH_CAN: return "en_CA"; + case SUBLANG_ENGLISH_NZ: return "en_NZ"; + case SUBLANG_ENGLISH_EIRE: return "en_IE"; + case SUBLANG_ENGLISH_SOUTH_AFRICA: return "en_ZA"; + case SUBLANG_ENGLISH_JAMAICA: return "en_JM"; + case SUBLANG_ENGLISH_CARIBBEAN: return "en_GD"; /* Grenada? */ + case SUBLANG_ENGLISH_BELIZE: return "en_BZ"; + case SUBLANG_ENGLISH_TRINIDAD: return "en_TT"; + case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW"; + case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH"; + case SUBLANG_ENGLISH_INDONESIA: return "en_ID"; + case SUBLANG_ENGLISH_HONGKONG: return "en_HK"; + case SUBLANG_ENGLISH_INDIA: return "en_IN"; + case SUBLANG_ENGLISH_MALAYSIA: return "en_MY"; + case SUBLANG_ENGLISH_SINGAPORE: return "en_SG"; + } + return "en"; + case LANG_ESTONIAN: return "et_EE"; + case LANG_FAEROESE: return "fo_FO"; + case LANG_FARSI: return "fa_IR"; + case LANG_FINNISH: return "fi_FI"; + case LANG_FRENCH: + switch (sub) + { + case SUBLANG_FRENCH: return "fr_FR"; + case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE"; + case SUBLANG_FRENCH_CANADIAN: return "fr_CA"; + case SUBLANG_FRENCH_SWISS: return "fr_CH"; + case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU"; + case SUBLANG_FRENCH_MONACO: return "fr_MC"; + case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */ + case SUBLANG_FRENCH_REUNION: return "fr_RE"; + case SUBLANG_FRENCH_CONGO: return "fr_CG"; + case SUBLANG_FRENCH_SENEGAL: return "fr_SN"; + case SUBLANG_FRENCH_CAMEROON: return "fr_CM"; + case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI"; + case SUBLANG_FRENCH_MALI: return "fr_ML"; + case SUBLANG_FRENCH_MOROCCO: return "fr_MA"; + case SUBLANG_FRENCH_HAITI: return "fr_HT"; + } + return "fr"; + case LANG_FRISIAN: return "fy_NL"; + case LANG_FULFULDE: return "ful_NG"; + case LANG_GAELIC: + switch (sub) + { + case 0x01: /* SCOTTISH */ return "gd_GB"; + case 0x02: /* IRISH */ return "ga_IE"; + } + return "C"; + case LANG_GALICIAN: return "gl_ES"; + case LANG_GEORGIAN: return "ka_GE"; + case LANG_GERMAN: + switch (sub) + { + case SUBLANG_GERMAN: return "de_DE"; + case SUBLANG_GERMAN_SWISS: return "de_CH"; + case SUBLANG_GERMAN_AUSTRIAN: return "de_AT"; + case SUBLANG_GERMAN_LUXEMBOURG: return "de_LU"; + case SUBLANG_GERMAN_LIECHTENSTEIN: return "de_LI"; + } + return "de"; + case LANG_GREEK: return "el_GR"; + case LANG_GUARANI: return "gn_PY"; + case LANG_GUJARATI: return "gu_IN"; + case LANG_HAUSA: return "ha_NG"; + case LANG_HAWAIIAN: + /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers) + or Hawaii Creole English ("cpe_US", 600000 speakers)? */ + return "cpe_US"; + case LANG_HEBREW: return "he_IL"; + case LANG_HINDI: return "hi_IN"; + case LANG_HUNGARIAN: return "hu_HU"; + case LANG_IBIBIO: return "nic_NG"; + case LANG_ICELANDIC: return "is_IS"; + case LANG_IGBO: return "ibo_NG"; + case LANG_INDONESIAN: return "id_ID"; + case LANG_INUKTITUT: return "iu_CA"; + case LANG_ITALIAN: + switch (sub) + { + case SUBLANG_ITALIAN: return "it_IT"; + case SUBLANG_ITALIAN_SWISS: return "it_CH"; + } + return "it"; + case LANG_JAPANESE: return "ja_JP"; + case LANG_KANNADA: return "kn_IN"; + case LANG_KANURI: return "kau_NG"; + case LANG_KASHMIRI: + switch (sub) + { + case SUBLANG_DEFAULT: return "ks_PK"; + case SUBLANG_KASHMIRI_INDIA: return "ks_IN"; + } + return "ks"; + case LANG_KAZAK: return "kk_KZ"; + case LANG_KONKANI: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "kok_IN"; + case LANG_KOREAN: return "ko_KR"; + case LANG_KYRGYZ: return "ky_KG"; + case LANG_LAO: return "lo_LA"; + case LANG_LATIN: return "la_VA"; + case LANG_LATVIAN: return "lv_LV"; + case LANG_LITHUANIAN: return "lt_LT"; + case LANG_MACEDONIAN: return "mk_MK"; + case LANG_MALAY: + switch (sub) + { + case SUBLANG_MALAY_MALAYSIA: return "ms_MY"; + case SUBLANG_MALAY_BRUNEI_DARUSSALAM: return "ms_BN"; + } + return "ms"; + case LANG_MALAYALAM: return "ml_IN"; + case LANG_MALTESE: return "mt_MT"; + case LANG_MANIPURI: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "mni_IN"; + case LANG_MARATHI: return "mr_IN"; + case LANG_MONGOLIAN: + return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN". */ + case LANG_NEPALI: + switch (sub) + { + case SUBLANG_DEFAULT: return "ne_NP"; + case SUBLANG_NEPALI_INDIA: return "ne_IN"; + } + return "ne"; + case LANG_NORWEGIAN: + switch (sub) + { + case SUBLANG_NORWEGIAN_BOKMAL: return "no_NO"; + case SUBLANG_NORWEGIAN_NYNORSK: return "nn_NO"; + } + return "no"; + case LANG_ORIYA: return "or_IN"; + case LANG_OROMO: return "om_ET"; + case LANG_PAPIAMENTU: return "pap_AN"; + case LANG_PASHTO: + return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */ + case LANG_POLISH: return "pl_PL"; + case LANG_PORTUGUESE: + switch (sub) + { + case SUBLANG_PORTUGUESE: return "pt_PT"; + /* Hmm. SUBLANG_PORTUGUESE_BRAZILIAN == SUBLANG_DEFAULT. + Same phenomenon as SUBLANG_ENGLISH_US == SUBLANG_DEFAULT. */ + case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR"; + } + return "pt"; + case LANG_PUNJABI: + switch (sub) + { + case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */ + case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */ + } + return "pa"; + case LANG_RHAETO_ROMANCE: return "rm_CH"; + case LANG_ROMANIAN: + switch (sub) + { + case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO"; + case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD"; + } + return "ro"; + case LANG_RUSSIAN: + return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */ + case LANG_SAAMI: /* actually Northern Sami */ return "se_NO"; + case LANG_SANSKRIT: return "sa_IN"; + case LANG_SINDHI: + switch (sub) + { + case SUBLANG_SINDHI_INDIA: return "sd_IN"; + case SUBLANG_SINDHI_PAKISTAN: return "sd_PK"; + } + return "sd"; + case LANG_SINHALESE: return "si_LK"; + case LANG_SLOVAK: return "sk_SK"; + case LANG_SLOVENIAN: return "sl_SI"; + case LANG_SOMALI: return "so_SO"; + case LANG_SORBIAN: + /* FIXME: Adjust this when such locales appear on Unix. */ + return "wen_DE"; + case LANG_SPANISH: + switch (sub) + { + case SUBLANG_SPANISH: return "es_ES"; + case SUBLANG_SPANISH_MEXICAN: return "es_MX"; + case SUBLANG_SPANISH_MODERN: + return "es_ES@modern"; /* not seen on Unix */ + case SUBLANG_SPANISH_GUATEMALA: return "es_GT"; + case SUBLANG_SPANISH_COSTA_RICA: return "es_CR"; + case SUBLANG_SPANISH_PANAMA: return "es_PA"; + case SUBLANG_SPANISH_DOMINICAN_REPUBLIC: return "es_DO"; + case SUBLANG_SPANISH_VENEZUELA: return "es_VE"; + case SUBLANG_SPANISH_COLOMBIA: return "es_CO"; + case SUBLANG_SPANISH_PERU: return "es_PE"; + case SUBLANG_SPANISH_ARGENTINA: return "es_AR"; + case SUBLANG_SPANISH_ECUADOR: return "es_EC"; + case SUBLANG_SPANISH_CHILE: return "es_CL"; + case SUBLANG_SPANISH_URUGUAY: return "es_UY"; + case SUBLANG_SPANISH_PARAGUAY: return "es_PY"; + case SUBLANG_SPANISH_BOLIVIA: return "es_BO"; + case SUBLANG_SPANISH_EL_SALVADOR: return "es_SV"; + case SUBLANG_SPANISH_HONDURAS: return "es_HN"; + case SUBLANG_SPANISH_NICARAGUA: return "es_NI"; + case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR"; + } + return "es"; + case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */ + case LANG_SWAHILI: return "sw_KE"; + case LANG_SWEDISH: + switch (sub) + { + case SUBLANG_DEFAULT: return "sv_SE"; + case SUBLANG_SWEDISH_FINLAND: return "sv_FI"; + } + return "sv"; + case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */ + case LANG_TAGALOG: return "tl_PH"; + case LANG_TAJIK: return "tg_TJ"; + case LANG_TAMAZIGHT: + switch (sub) + { + /* FIXME: Adjust this when Tamazight locales appear on Unix. */ + case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic"; + case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin"; + } + return "ber_MA"; + case LANG_TAMIL: + return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */ + case LANG_TATAR: return "tt_RU"; + case LANG_TELUGU: return "te_IN"; + case LANG_THAI: return "th_TH"; + case LANG_TIBETAN: return "bo_CN"; + case LANG_TIGRINYA: + switch (sub) + { + case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET"; + case SUBLANG_TIGRINYA_ERITREA: return "ti_ER"; + } + return "ti"; + case LANG_TSONGA: return "ts_ZA"; + case LANG_TSWANA: return "tn_BW"; + case LANG_TURKISH: return "tr_TR"; + case LANG_TURKMEN: return "tk_TM"; + case LANG_UKRAINIAN: return "uk_UA"; + case LANG_URDU: + switch (sub) + { + case SUBLANG_URDU_PAKISTAN: return "ur_PK"; + case SUBLANG_URDU_INDIA: return "ur_IN"; + } + return "ur"; + case LANG_UZBEK: + switch (sub) + { + case SUBLANG_UZBEK_LATIN: return "uz_UZ"; + case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic"; + } + return "uz"; + case LANG_VENDA: + /* FIXME: It's not clear whether Venda has the ISO 639-2 two-letter code + "ve" or not. + http://www.loc.gov/standards/iso639-2/englangn.html has it, but + http://lcweb.loc.gov/standards/iso639-2/codechanges.html doesn't, */ + return "ven_ZA"; /* or "ve_ZA"? */ + case LANG_VIETNAMESE: return "vi_VN"; + case LANG_WELSH: return "cy_GB"; + case LANG_XHOSA: return "xh_ZA"; + case LANG_YI: return "sit_CN"; + case LANG_YIDDISH: return "yi_IL"; + case LANG_YORUBA: return "yo_NG"; + case LANG_ZULU: return "zu_ZA"; + default: return "C"; + } + +#endif /* HAVE_W32_SYSTEM */ +} + +/* localname.c from gettext END. */ + +/* Support functions. */ + +typedef uint32_t u32; +typedef unsigned long ulong; + +static __inline__ u32 +do_swap_u32 (u32 i) +{ + return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); +} + +#define SWAPIT(flag, data) ((flag) ? do_swap_u32(data) : (data)) + + +/* We assume to have `unsigned long int' value with at least 32 bits. */ +#define HASHWORDBITS 32 + +/* The so called `hashpjw' function by P.J. Weinberger + [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, + 1986, 1987 Bell Telephone Laboratories, Inc.] */ + +static __inline__ ulong +hash_string( const char *str_param ) +{ + unsigned long int hval, g; + const char *str = str_param; + + hval = 0; + while (*str != '\0') + { + hval <<= 4; + hval += (unsigned long int) *str++; + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); + if (g != 0) + { + hval ^= g >> (HASHWORDBITS - 8); + hval ^= g; + } + } + return hval; +} + + +/* Generic message catalog and gettext stuff. */ + +/* The magic number of the GNU message catalog format. */ +#define MAGIC 0x950412de +#define MAGIC_SWAPPED 0xde120495 + +/* Revision number of the currently used .mo (binary) file format. */ +#define MO_REVISION_NUMBER 0 + +/* Header for binary .mo file format. */ +struct mo_file_header +{ + /* The magic number. */ + u32 magic; + /* The revision number of the file format. */ + u32 revision; + /* The number of strings pairs. */ + u32 nstrings; + /* Offset of table with start offsets of original strings. */ + u32 orig_tab_offset; + /* Offset of table with start offsets of translation strings. */ + u32 trans_tab_offset; + /* Size of hashing table. */ + u32 hash_tab_size; + /* Offset of first hashing entry. */ + u32 hash_tab_offset; +}; + +struct string_desc +{ + /* Length of addressed string. */ + u32 length; + /* Offset of string in file. */ + u32 offset; +}; + + +struct overflow_space_s +{ + struct overflow_space_s *next; + u32 idx; + char d[1]; +}; + +struct loaded_domain +{ + char *data; + int must_swap; + u32 nstrings; + char *mapped; /* 0 = not yet mapped, 1 = mapped, + 2 = mapped to + overflow space */ + struct overflow_space_s *overflow_space; + struct string_desc *orig_tab; + struct string_desc *trans_tab; + u32 hash_size; + u32 *hash_tab; +}; + + +/* Free the domain data. */ +static void +free_domain (struct loaded_domain *domain) +{ + struct overflow_space_s *os, *os2; + free (domain->data); + free (domain->mapped); + for (os = domain->overflow_space; os; os = os2) + { + os2 = os->next; + free (os); + } + free (domain); +} + + +/* The gettext implementation; support functions. */ +static struct loaded_domain * +load_domain (const char *filename) +{ + FILE *fp; + size_t size; + struct stat st; + struct mo_file_header *data = NULL; + struct loaded_domain *domain = NULL; + size_t to_read; + char *read_ptr; + + fp = fopen (filename, "rb"); + if (!fp) + return NULL; + + /* Determine the file size. */ + if (fstat (fileno (fp), &st) + || (size = (size_t) st.st_size) != st.st_size + || size < sizeof (struct mo_file_header)) + { + fclose (fp); + return NULL; + } + + data = malloc (size); + if (!data) + { + fclose (fp); + return NULL; + } + + to_read = size; + read_ptr = (char *) data; + do + { + long int nb = fread (read_ptr, 1, to_read, fp); + if (nb < to_read) + { + fclose (fp); + free (data); + return NULL; + } + read_ptr += nb; + to_read -= nb; + } + while (to_read > 0); + fclose (fp); + + /* Using the magic number we can test whether it really is a message + catalog file. */ + if (data->magic != MAGIC && data->magic != MAGIC_SWAPPED) + { + /* The magic number is wrong: not a message catalog file. */ + free (data); + return NULL; + } + + domain = calloc (1, sizeof *domain); + if (!domain) + { + free (data); + return NULL; + } + domain->data = (char *) data; + domain->must_swap = data->magic != MAGIC; + + /* Fill in the information about the available tables. */ + switch (SWAPIT (domain->must_swap, data->revision)) + { + case 0: + + domain->nstrings = SWAPIT (domain->must_swap, data->nstrings); + domain->orig_tab = (struct string_desc *) + ((char *) data + SWAPIT (domain->must_swap, data->orig_tab_offset)); + domain->trans_tab = (struct string_desc *) + ((char *) data + SWAPIT (domain->must_swap, data->trans_tab_offset)); + domain->hash_size = SWAPIT (domain->must_swap, data->hash_tab_size); + domain->hash_tab = (u32 *) + ((char *) data + SWAPIT (domain->must_swap, data->hash_tab_offset)); + break; + + default: + /* This is an invalid revision. */ + free (data); + free (domain); + return NULL; + } + + /* Allocate an array to keep track of code page mappings. */ + domain->mapped = calloc (1, domain->nstrings); + if (!domain->mapped) + { + free (data); + free (domain); + return NULL; + } + + return domain; +} + + +/* Return a malloced string encoded in UTF-8 from the wide char input + string STRING. Caller must free this value. On failure returns + NULL; caller may use GetLastError to get the actual error number. + The result of calling this function with STRING set to NULL is not + defined. */ +static char * +wchar_to_native (const wchar_t *string) +{ + int n; + char *result; + + n = WideCharToMultiByte (CP_ACP, 0, string, -1, NULL, 0, NULL, NULL); + if (n < 0) + return NULL; + + result = malloc (n+1); + if (!result) + return NULL; + + n = WideCharToMultiByte (CP_ACP, 0, string, -1, result, n, NULL, NULL); + if (n < 0) + { + free (result); + return NULL; + } + return result; +} + + +/* Return a malloced wide char string from an UTF-8 encoded input + string STRING. Caller must free this value. On failure returns + NULL; caller may use GetLastError to get the actual error number. + The result of calling this function with STRING set to NULL is not + defined. */ +static wchar_t * +utf8_to_wchar (const char *string) +{ + int n; + wchar_t *result; + + n = MultiByteToWideChar (CP_UTF8, 0, string, -1, NULL, 0); + if (n < 0) + return NULL; + + result = malloc ((n+1) * sizeof *result); + if (!result) + return NULL; + + n = MultiByteToWideChar (CP_UTF8, 0, string, -1, result, n); + if (n < 0) + { + free (result); + return NULL; + } + return result; +} + + +static char * +utf8_to_native (const char *string) +{ + wchar_t *wstring; + char *result; + + wstring = utf8_to_wchar (string); + if (!wstring) + return NULL; + + result = wchar_to_native (wstring); + free (wstring); + + return result; +} + + +static const char* +get_string (struct loaded_domain *domain, u32 idx) +{ + struct overflow_space_s *os; + char *p; + + p = domain->data + SWAPIT (domain->must_swap, domain->trans_tab[idx].offset); + if (!domain->mapped[idx]) + { + size_t plen, buflen; + char *buf; + + domain->mapped[idx] = 1; + + plen = strlen (p); + buf = utf8_to_native (p); + buflen = strlen (buf); + if (buflen <= plen) + strcpy (p, buf); + else + { + /* There is not enough space for the translation - store it + in the overflow_space else and mark that in the mapped + array. Because we expect that this won't happen too + often, we use a simple linked list. */ + os = malloc (sizeof *os + buflen); + if (os) + { + os->idx = idx; + strcpy (os->d, buf); + os->next = domain->overflow_space; + domain->overflow_space = os; + p = os->d; + } + else + p = "ERROR in GETTEXT MALLOC"; + } + free (buf); + } + else if (domain->mapped[idx] == 2) + { + /* We need to get the string from the overflow_space. */ + for (os=domain->overflow_space; os; os = os->next) + if (os->idx == idx) + return (const char*) os->d; + p = "ERROR in GETTEXT\n"; + } + return (const char*) p; +} + + + +/* The domain we use. We only support one domain at this point. This + is why this implementation can not be shared. Bindtextdomain and + dgettext will simply cheat and always use this one domain. */ +static struct loaded_domain *the_domain; + + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +char * +bindtextdomain (const char *domainname, const char *dirname) +{ + struct loaded_domain *domain = NULL; + const char *catval_full; + char *catval; + char *fname; + + /* DOMAINNAME is ignored. We only support one domain. */ + + /* DIRNAME is "$INSTALLDIR\share\locale". */ + + /* First found out the category value. */ + catval = NULL; + catval_full = _nl_locale_name (LC_MESSAGES, "LC_MESSAGES"); + + /* Normally, we would have to loop over all returned locales, and + search for the right file. See gettext intl/dcigettext.c for all + the gory details. Here, we only support the basic category, and + ignore everything else. */ + if (catval_full) + { + char *p; + + catval = malloc (strlen (catval_full) + 1); + if (catval) + { + strcpy (catval, catval_full); + p = strchr (catval, '_'); + if (p) + *p = '\0'; + } + } + if (!catval) + return NULL; + + /* Now build the filename string. The complete filename is this: + DIRNAME + \ + CATVAL + \LC_MESSAGES\ + DOMAINNAME + .mo */ + { + int len = strlen (dirname) + 1 + strlen (catval) + 13 + + strlen (domainname) + 3 + 1; + char *p; + + fname = malloc (len); + if (!fname) + { + free (catval); + return NULL; + } + + p = fname; + strcpy (p, dirname); + p += strlen (dirname); + *(p++) = '\\'; + strcpy (p, catval); + p += strlen (catval); + strcpy (p, "\\LC_MESSAGES\\"); + p += 13; + strcpy (p, domainname); + p += strlen (domainname); + strcpy (p, ".mo"); + } + + domain = load_domain (fname); + free (catval); + free (fname); + + /* We should not be invoked twice, but this is how you would do + it if it happened. */ + if (the_domain) + free_domain (the_domain); + the_domain = domain; + + /* For historic reasoins we are not allowed to return a const char*. */ + return (char*)dirname; +} + + +const char * +gettext (const char *msgid) +{ + struct loaded_domain *domain; + size_t act = 0; + size_t top, bottom; + + if (!(domain = the_domain)) + goto not_found; + + /* Locate the MSGID and its translation. */ + if (domain->hash_size > 2 && domain->hash_tab) + { + /* Use the hashing table. */ + u32 len = strlen (msgid); + u32 hash_val = hash_string (msgid); + u32 idx = hash_val % domain->hash_size; + u32 incr = 1 + (hash_val % (domain->hash_size - 2)); + u32 nstr = SWAPIT (domain->must_swap, domain->hash_tab[idx]); + + if (!nstr) + /* Hash table entry is empty. */ + goto not_found; + + if (SWAPIT (domain->must_swap, + domain->orig_tab[nstr - 1].length) == len + && !strcmp (msgid, + domain->data + + SWAPIT (domain->must_swap, + domain->orig_tab[nstr - 1].offset))) + return get_string (domain, nstr - 1); + + for(;;) + { + if (idx >= domain->hash_size - incr) + idx -= domain->hash_size - incr; + else + idx += incr; + + nstr = SWAPIT (domain->must_swap, domain->hash_tab[idx]); + if (!nstr) + /* Hash table entry is empty. */ + goto not_found; + + if (SWAPIT (domain->must_swap, + domain->orig_tab[nstr - 1].length) == len + && !strcmp (msgid, + domain->data + + SWAPIT (domain->must_swap, + domain->orig_tab[nstr - 1].offset))) + return get_string (domain, nstr-1); + } + /* NOTREACHED */ + } + + /* Now we try the default method: binary search in the sorted array + of messages. */ + bottom = 0; + top = domain->nstrings; + while (bottom < top) + { + int cmp_val; + + act = (bottom + top) / 2; + cmp_val = strcmp(msgid, domain->data + + SWAPIT (domain->must_swap, + domain->orig_tab[act].offset)); + if (cmp_val < 0) + top = act; + else if (cmp_val > 0) + bottom = act + 1; + else + return get_string (domain, act); + } + not_found: + return msgid; +} + + +char * +textdomain (const char *domainname) +{ + /* For now, support only one domain. */ + return (char*)domainname; +} + +char * +dgettext (const char *domainname, const char *msgid) +{ + /* For now, support only one domain. */ + return (char*)gettext (msgid); +} + +/* Return the locale name as used by gettext. The return value will + never be NULL. */ +const char * +gettext_localename (void) +{ + const char *s; + + s = _nl_locale_name (LC_MESSAGES, "LC_MESSAGES"); + return s? s:""; +} Added: trunk/src/w32-gettext.h =================================================================== --- trunk/src/w32-gettext.h 2005-12-07 17:16:53 UTC (rev 134) +++ trunk/src/w32-gettext.h 2006-01-02 08:51:34 UTC (rev 135) @@ -0,0 +1,56 @@ +/* w32-gettext.h - A simple gettext implementation for Windows targets. + Copyright (C) 2005 g10 Code GmbH + + This file is part of libgpg-error. + + libgpg-error is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + as published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + libgpg-error 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with libgpg-error; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +#if ENABLE_NLS + +#include +#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun)) +# define LC_MESSAGES 1729 +#endif + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +char *bindtextdomain (const char *domainname, const char *dirname); + +const char *gettext (const char *msgid); + +char *textdomain (const char *domainname); + +char *dgettext (const char *domainname, const char *msgid); + +/* Return the localname as used by gettext. The return value will + never be NULL. */ +const char *gettext_localename (void); + +/* A pseudo function call that serves as a marker for the automated + extraction of messages, but does not call gettext(). The run-time + translation is done at a different place in the code. + The argument, String, should be a literal string. Concatenated strings + and other string expressions won't work. + The macro's expansion is not parenthesized, so that it is suitable as + initializer for static 'char[]' or 'const char[]' variables. */ +#define gettext_noop(String) String + + +#else /* ENABLE_NLS */ + +static inline const char *gettext_localename (void) { return ""; } + +#endif /* !ENABLE_NLS */ From cvs at cvs.gnupg.org Tue Jan 3 15:20:13 2006 From: cvs at cvs.gnupg.org (svn author marcus) Date: Tue Jan 3 14:42:30 2006 Subject: [svn] gpgme - r1147 - trunk/gpgme Message-ID: Author: marcus Date: 2006-01-03 15:20:12 +0100 (Tue, 03 Jan 2006) New Revision: 1147 Modified: trunk/gpgme/ChangeLog trunk/gpgme/w32-glib-io.c Log: 2006-01-03 Marcus Brinkmann * w32-glib-io.c (_gpgme_io_close): Only close fd if there is no channel for it. Modified: trunk/gpgme/ChangeLog =================================================================== --- trunk/gpgme/ChangeLog 2005-12-31 12:56:49 UTC (rev 1146) +++ trunk/gpgme/ChangeLog 2006-01-03 14:20:12 UTC (rev 1147) @@ -1,3 +1,8 @@ +2006-01-03 Marcus Brinkmann + + * w32-glib-io.c (_gpgme_io_close): Only close fd if there is no + channel for it. + 2005-12-31 Marcus Brinkmann * w32-glib-io.c (find_channel): Set channel to unbuffered. Modified: trunk/gpgme/w32-glib-io.c =================================================================== --- trunk/gpgme/w32-glib-io.c 2005-12-31 12:56:49 UTC (rev 1146) +++ trunk/gpgme/w32-glib-io.c 2006-01-03 14:20:12 UTC (rev 1147) @@ -287,9 +287,9 @@ g_io_channel_unref (chan); giochannel_table[fd] = NULL; } + else + _close (fd); - _close (fd); - return 0; } From cvs at cvs.gnupg.org Tue Jan 3 19:31:49 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Tue Jan 3 18:54:09 2006 Subject: [svn] gpgme - r1148 - in trunk: . gpgme Message-ID: Author: wk Date: 2006-01-03 19:31:48 +0100 (Tue, 03 Jan 2006) New Revision: 1148 Modified: trunk/NEWS trunk/configure.ac trunk/gpgme/ChangeLog trunk/gpgme/gpgme.h trunk/gpgme/verify.c Log: Added PKA stuff Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2006-01-03 14:20:12 UTC (rev 1147) +++ trunk/NEWS 2006-01-03 18:31:48 UTC (rev 1148) @@ -21,9 +21,8 @@ * New status codes GPGME_PKA_TRUST_GOOD and GPGME_PKA_TRUST_BAD. They are analyzed by the verify handlers and made available in the - new PKA_TRUST field of the signature result structure. + new PKA_TRUST and PKA_ADDRESS fields of the signature result structure. - * Interface changes relative to the 1.1.0 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gpgme_key_sig_t EXTENDED: New field notations. @@ -32,6 +31,7 @@ GPGME_STATUS_PKA_TRUST_BAD NEW GPGME_STATUS_PKA_TRUST_GOOD NEW gpgme_signature_t EXTENDED: New field pka_trust. +gpgme_signature_t EXTENDED: New field pka_address. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-01-03 14:20:12 UTC (rev 1147) +++ trunk/configure.ac 2006-01-03 18:31:48 UTC (rev 1148) @@ -25,7 +25,7 @@ # Version number: Remember to change it immediately *after* a release. # Make sure to run "svn up" before a "make dist". -AC_INIT(gpgme, 1.2.0-cvs, [bug-gpgme@gnupg.org]) +AC_INIT(gpgme, 1.1.1-cvs, [bug-gpgme@gnupg.org]) # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) Modified: trunk/gpgme/ChangeLog =================================================================== --- trunk/gpgme/ChangeLog 2006-01-03 14:20:12 UTC (rev 1147) +++ trunk/gpgme/ChangeLog 2006-01-03 18:31:48 UTC (rev 1148) @@ -8,11 +8,17 @@ * w32-glib-io.c (find_channel): Set channel to unbuffered. (_gpgme_io_select): Fix debug output. +2005-12-23 Werner Koch + + * gpgme.h (struct _gpgme_signature): Append field PKA_ADDRESS. + * verify.c (release_op_data, _gpgme_verify_status_handler): Set + this field. + 2005-12-20 Werner Koch * gpgme.h (gpgme_status_code_t): Added GPGME_STATUS_PKA_TRUST_BAD and GPGME_STATUS_PKA_TRUST_GOOD. - (gpgme_signature_t): New field pka_trust. + (struct _gpgme_signature): New field pka_trust. * verify.c (_gpgme_verify_status_handler): Set pka_trust. 2005-12-06 Werner Koch Modified: trunk/gpgme/gpgme.h =================================================================== --- trunk/gpgme/gpgme.h 2006-01-03 14:20:12 UTC (rev 1147) +++ trunk/gpgme/gpgme.h 2006-01-03 18:31:48 UTC (rev 1148) @@ -72,7 +72,7 @@ AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "1.2.0-cvs" +#define GPGME_VERSION "1.1.1-cvs" @@ -1020,11 +1020,11 @@ gpgme_error_t gpgme_data_set_encoding (gpgme_data_t dh, gpgme_data_encoding_t enc); -/* Get the filename associated with the data object with handle DH, or +/* Get the file name associated with the data object with handle DH, or NULL if there is none. */ char *gpgme_data_get_file_name (gpgme_data_t dh); -/* Set the filename associated with the data object with handle DH to +/* Set the file name associated with the data object with handle DH to FILE_NAME. */ gpgme_error_t gpgme_data_set_file_name (gpgme_data_t dh, const char *file_name); @@ -1334,6 +1334,9 @@ /* The hash algorithm used to create the signature. */ gpgme_hash_algo_t hash_algo; + + /* The mailbox from the PKA information or NULL. */ + char *pka_address; }; typedef struct _gpgme_signature *gpgme_signature_t; Modified: trunk/gpgme/verify.c =================================================================== --- trunk/gpgme/verify.c 2006-01-03 14:20:12 UTC (rev 1147) +++ trunk/gpgme/verify.c 2006-01-03 18:31:48 UTC (rev 1148) @@ -64,6 +64,8 @@ if (sig->fpr) free (sig->fpr); + if (sig->pka_address) + free (sig->pka_address); free (sig); sig = next; } @@ -588,6 +590,7 @@ void *hook; op_data_t opd; gpgme_signature_t sig; + char *end; err = _gpgme_op_data_lookup (ctx, OPDATA_VERIFY, &hook, -1, NULL); opd = hook; @@ -654,10 +657,15 @@ case GPGME_STATUS_PKA_TRUST_BAD: case GPGME_STATUS_PKA_TRUST_GOOD: opd->only_newsig_seen = 0; - if (sig && !sig->pka_trust) - sig->pka_trust = code == GPGME_STATUS_PKA_TRUST_GOOD? 2 : 1; - /* FIXME: We should set the mailbox which is the argument to - these status codes into a new field. */ + /* Check that we only get one of these status codes per + signature; if not the crypto backend misbehaves. */ + if (!sig || sig->pka_trust || sig->pka_address) + return gpg_error (GPG_ERR_INV_ENGINE); + sig->pka_trust = code == GPGME_STATUS_PKA_TRUST_GOOD? 2 : 1; + end = strchr (args, ' '); + if (end) + *end = 0; + sig->pka_address = strdup (args); break; case GPGME_STATUS_ERROR: From cvs at cvs.gnupg.org Tue Jan 3 19:40:34 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Tue Jan 3 19:02:48 2006 Subject: [svn] gpgme - r1149 - trunk Message-ID: Author: wk Date: 2006-01-03 19:40:33 +0100 (Tue, 03 Jan 2006) New Revision: 1149 Modified: trunk/ChangeLog trunk/configure.ac Log: Append revision number to the version string Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-01-03 18:31:48 UTC (rev 1148) +++ trunk/ChangeLog 2006-01-03 18:40:33 UTC (rev 1149) @@ -1,3 +1,7 @@ +2006-01-03 Werner Koch + + * configure.ac: Append SVN revision to the version. + 2005-11-18 Werner Koch * configure.ac (BUILD_REVISION): New. Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-01-03 18:31:48 UTC (rev 1148) +++ trunk/configure.ac 2006-01-03 18:40:33 UTC (rev 1149) @@ -25,7 +25,24 @@ # Version number: Remember to change it immediately *after* a release. # Make sure to run "svn up" before a "make dist". -AC_INIT(gpgme, 1.1.1-cvs, [bug-gpgme@gnupg.org]) +# See below for the LT versions. +# +# The CVS version is usually the next intended release version with +# the string "-cvs" appended. The reason for this is that tests for a +# specific feature can already be done under the assumption that the +# CVS version is the most recent one in a branch. To disable the CVS +# version for the real release, just comment out the my_iscvs macro. +# Note, that we are now using Subversion instead of CVS and append the +# SVN revision number to the "cvs" suffix. To make this most useful +# for snapshot releases please do an "svn up" right before recreating +# the configure script, so that a proper revision number for all files +# is available when running a "make distcheck". +m4_define(my_version, [1.1.1]) +m4_define(my_iscvs, yes) +AC_INIT([gpgme], my_version[]m4_ifdef([my_iscvs], [-cvs[]m4_translit( + [$Revision$],[Ra-z $:])]), + [bug-gpgme@gnupg.org]) + # LT Version numbers, remember to change them just *before* a release. # (Code changed: REVISION++) # (Interfaces added/removed/changed: CURRENT++, REVISION=0) From cvs at cvs.gnupg.org Thu Jan 5 09:58:51 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Thu Jan 5 09:20:57 2006 Subject: [svn] gpgme - r1150 - in trunk: . gpgme Message-ID: Author: wk Date: 2006-01-05 09:58:50 +0100 (Thu, 05 Jan 2006) New Revision: 1150 Modified: trunk/ChangeLog trunk/configure.ac trunk/gpgme/ChangeLog trunk/gpgme/debug.c trunk/gpgme/debug.h trunk/gpgme/gpgme.h trunk/gpgme/w32-glib-io.c Log: Minor glib fix. Pretty up debug output. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-01-03 18:40:33 UTC (rev 1149) +++ trunk/ChangeLog 2006-01-05 08:58:50 UTC (rev 1150) @@ -1,3 +1,8 @@ +2006-01-05 Werner Koch + + * configure.ac: Test for inline feature. + (AH_BOTTOM): New to define the pure attribute. + 2006-01-03 Werner Koch * configure.ac: Append SVN revision to the version. Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-01-03 18:40:33 UTC (rev 1149) +++ trunk/configure.ac 2006-01-05 08:58:50 UTC (rev 1150) @@ -180,6 +180,7 @@ # Type checks. +AC_C_INLINE AC_CHECK_SIZEOF(unsigned int) AC_SYS_LARGEFILE AC_TYPE_OFF_T @@ -507,7 +508,16 @@ #endif ]) +AH_BOTTOM([ +/* Definition of GCC specific attributes. */ +#if __GNUC__ > 2 +# define GPGME_GCC_A_PURE __attribute__ ((__pure__)) +#else +# define GPGME_GCC_A_PURE +#endif +]) + # Substitution used for gpgme-config GPGME_CONFIG_LIBS="-lgpgme" GPGME_CONFIG_CFLAGS="" Modified: trunk/gpgme/ChangeLog =================================================================== --- trunk/gpgme/ChangeLog 2006-01-03 18:40:33 UTC (rev 1149) +++ trunk/gpgme/ChangeLog 2006-01-05 08:58:50 UTC (rev 1150) @@ -1,3 +1,10 @@ +2006-01-04 Werner Koch + + * debug.h (_gpgme_debug_srcname): New. Use it with the debug macros. + + * w32-glib-io.c (_gpgme_io_set_nonblocking): Add debug + statements. Disable error return for failed nonblocking call. + 2006-01-03 Marcus Brinkmann * w32-glib-io.c (_gpgme_io_close): Only close fd if there is no Modified: trunk/gpgme/debug.c =================================================================== --- trunk/gpgme/debug.c 2006-01-03 18:40:33 UTC (rev 1149) +++ trunk/gpgme/debug.c 2006-01-05 08:58:50 UTC (rev 1150) @@ -1,6 +1,6 @@ /* debug.c - helpful output in desperate situations Copyright (C) 2000 Werner Koch (dd9jn) - Copyright (C) 2001, 2002, 2003, 2004 g10 Code GmbH + Copyright (C) 2001, 2002, 2003, 2004, 2005 g10 Code GmbH This file is part of GPGME. Modified: trunk/gpgme/debug.h =================================================================== --- trunk/gpgme/debug.h 2006-01-03 18:40:33 UTC (rev 1149) +++ trunk/gpgme/debug.h 2006-01-05 08:58:50 UTC (rev 1150) @@ -1,5 +1,5 @@ /* debug.h - interface to debugging functions - Copyright (C) 2002, 2004 g10 Code GmbH + Copyright (C) 2002, 2004, 2005 g10 Code GmbH This file is part of GPGME. @@ -21,6 +21,20 @@ #ifndef DEBUG_H #define DEBUG_H +#include + +/* Remove path components from filenames (i.e. __FILE__) for cleaner + logs. */ +static inline const char *_gpgme_debug_srcname (const char *file) + GPGME_GCC_A_PURE; + +static inline const char * +_gpgme_debug_srcname (const char *file) +{ + const char *s = strrchr (file, '/'); + return s? s+1:file; +} + /* Log the formatted string FORMAT at debug level LEVEL or higher. */ void _gpgme_debug (int level, const char *format, ...); @@ -76,22 +90,26 @@ #else /* This finally works everywhere, horror. */ #define DEBUG0(fmt) \ - _gpgme_debug (1, "%s:%s: " fmt, __FILE__, XSTRINGIFY (__LINE__)) + _gpgme_debug (1, "%s:%s: " fmt, _gpgme_debug_srcname (__FILE__), \ + XSTRINGIFY (__LINE__)) #define DEBUG1(fmt,a) \ - _gpgme_debug (1, "%s:%s: " fmt, __FILE__, XSTRINGIFY (__LINE__), (a)) + _gpgme_debug (1, "%s:%s: " fmt, _gpgme_debug_srcname (__FILE__), \ + XSTRINGIFY (__LINE__), (a)) #define DEBUG2(fmt,a,b) \ - _gpgme_debug (1, "%s:%s: " fmt, __FILE__, XSTRINGIFY (__LINE__), (a), (b)) + _gpgme_debug (1, "%s:%s: " fmt, _gpgme_debug_srcname (__FILE__), \ + XSTRINGIFY (__LINE__), (a), (b)) #define DEBUG3(fmt,a,b,c) \ - _gpgme_debug (1, "%s:%s: " fmt, __FILE__, XSTRINGIFY (__LINE__), (a), (b), \ - (c)) + _gpgme_debug (1, "%s:%s: " fmt, _gpgme_debug_srcname (__FILE__), \ + XSTRINGIFY (__LINE__), (a), (b), (c)) #define DEBUG4(fmt,a,b,c,d) \ - _gpgme_debug (1, "%s:%s: " fmt, __FILE__, XSTRINGIFY (__LINE__), (a), (b), \ - (c), (d)) + _gpgme_debug (1, "%s:%s: " fmt, _gpgme_debug_srcname (__FILE__), \ + XSTRINGIFY (__LINE__), (a), (b), (c), (d)) #define DEBUG5(fmt,a,b,c,d,e) \ - _gpgme_debug (1, "%s:%s: " fmt, __FILE__, XSTRINGIFY (__LINE__), (a), (b), \ - (c), (d), (e)) + _gpgme_debug (1, "%s:%s: " fmt, _gpgme_debug_srcname (__FILE__), \ + XSTRINGIFY (__LINE__), (a), (b), (c), (d), (e)) #define DEBUG_BEGIN(hlp,lvl,fmt) \ - _gpgme_debug_begin (&(hlp), lvl, "%s:%s: " fmt, __FILE__, XSTRINGIFY (__LINE__)) + _gpgme_debug_begin (&(hlp), lvl, "%s:%s: " fmt, \ + _gpgme_debug_srcname (__FILE__), XSTRINGIFY (__LINE__)) #define DEBUG_ADD0(hlp,fmt) \ _gpgme_debug_add (&(hlp), fmt) #define DEBUG_ADD1(hlp,fmt,a) \ Modified: trunk/gpgme/gpgme.h =================================================================== --- trunk/gpgme/gpgme.h 2006-01-03 18:40:33 UTC (rev 1149) +++ trunk/gpgme/gpgme.h 2006-01-05 08:58:50 UTC (rev 1150) @@ -72,7 +72,7 @@ AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "1.1.1-cvs" +#define GPGME_VERSION "1.1.1-cvs1149" Modified: trunk/gpgme/w32-glib-io.c =================================================================== --- trunk/gpgme/w32-glib-io.c 2006-01-03 18:40:33 UTC (rev 1149) +++ trunk/gpgme/w32-glib-io.c 2006-01-05 08:58:50 UTC (rev 1150) @@ -290,6 +290,7 @@ else _close (fd); + return 0; } @@ -313,21 +314,25 @@ { GIOChannel *chan; GIOStatus status; - + chan = find_channel (fd, 0); if (!chan) { + DEBUG1 ("set nonblocking for fd %d failed: channel not found", fd); errno = EIO; return -1; } - status = g_io_channel_set_flags (chan, + status = g_io_channel_set_flags (chan, g_io_channel_get_flags (chan) | G_IO_FLAG_NONBLOCK, NULL); if (status != G_IO_STATUS_NORMAL) { - errno = EIO; - return -1; + /* glib 1.9.2 does not implement set_flags and returns an error. */ + DEBUG2 ("set nonblocking for fd %d failed: status=%d - ignored", + fd, status); +/* errno = EIO; */ +/* return -1; */ } return 0; From cvs at cvs.gnupg.org Sat Jan 7 22:04:15 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Sat Jan 7 21:26:08 2006 Subject: [svn] GnuPG - r3985 - trunk/g10 Message-ID: Author: dshaw Date: 2006-01-07 22:04:13 +0100 (Sat, 07 Jan 2006) New Revision: 3985 Modified: trunk/g10/ChangeLog trunk/g10/keyserver.c Log: * keyserver.c (keyserver_refresh): Fix problem when more than one key in a refresh batch has a preferred keyserver set. Noted by Nicolas Rachinsky. Modified: trunk/g10/ChangeLog =================================================================== --- trunk/g10/ChangeLog 2006-01-01 18:12:57 UTC (rev 3984) +++ trunk/g10/ChangeLog 2006-01-07 21:04:13 UTC (rev 3985) @@ -1,3 +1,9 @@ +2006-01-07 David Shaw + + * keyserver.c (keyserver_refresh): Fix problem when more than one + key in a refresh batch has a preferred keyserver set. Noted by + Nicolas Rachinsky. + 2006-01-01 David Shaw * mainproc.c (check_sig_and_print), keyserver.c Modified: trunk/g10/keyserver.c =================================================================== --- trunk/g10/keyserver.c 2006-01-01 18:12:57 UTC (rev 3984) +++ trunk/g10/keyserver.c 2006-01-07 21:04:13 UTC (rev 3985) @@ -1794,7 +1794,7 @@ int i; /* Try to handle preferred keyserver keys first */ - for(i=0;i Author: mo Date: 2006-01-08 03:10:46 +0100 (Sun, 08 Jan 2006) New Revision: 1143 Modified: trunk/doc/ChangeLog trunk/doc/gcrypt.texi Log: 2006-01-08 Moritz Schulte * gcrypt.texi: Added documentation for more gcry_control commands. * gcrypt.texi: Fixed several typos; thanks to Tommi Vainikainen. 2005-12-16 Moritz Schulte * gcrypt.texi (MPI formats): Fix return types of functions: gcry_mpi_scan, gcry_mpi_print, gcry_mpi_aprint. Modified: trunk/doc/ChangeLog =================================================================== --- trunk/doc/ChangeLog 2005-12-08 15:34:16 UTC (rev 1142) +++ trunk/doc/ChangeLog 2006-01-08 02:10:46 UTC (rev 1143) @@ -1,3 +1,14 @@ +2006-01-08 Moritz Schulte + + * gcrypt.texi: Added documentation for more gcry_control commands. + + * gcrypt.texi: Fixed several typos; thanks to Tommi Vainikainen. + +2005-12-16 Moritz Schulte + + * gcrypt.texi (MPI formats): Fix return types of functions: + gcry_mpi_scan, gcry_mpi_print, gcry_mpi_aprint. + 2005-11-26 Moritz Schulte * gcrypt.texi: New chapter: Prime numbers. Modified: trunk/doc/gcrypt.texi =================================================================== --- trunk/doc/gcrypt.texi 2005-12-08 15:34:16 UTC (rev 1142) +++ trunk/doc/gcrypt.texi 2006-01-08 02:10:46 UTC (rev 1143) @@ -531,17 +531,40 @@ @item GCRYCTL_DISABLE_SECMEM_WARN @item GCRYCTL_SUSPEND_SECMEM_WARN @item GCRYCTL_RESUME_SECMEM_WARN -@item GCRYCTL_USE_SECURE_RNDPOOL -@item GCRYCTL_SET_RANDOM_SEED_FILE -@item GCRYCTL_UPDATE_RANDOM_SEED_FILE + +@item GCRYCTL_USE_SECURE_RNDPOOL; Arguments: none + +This command tells the PRNG to store random numbers in secure memory. +FIXME: what about initialization time? + +@item GCRYCTL_SET_RANDOM_SEED_FILE; Arguments: const char *filename + +This command specifies the file, which is to be used as seed file for +the PRNG. If the seed file is registered prior to initialization of the +PRNG, the seed file's content (if it exists and seems to be valid) is +feed into the PRNG pool. After the seed file has been registered, the +PRNG can be signalled to write out the PRNG pool's content into the seed +file with the following command. + +@item GCRYCTL_UPDATE_RANDOM_SEED_FILE; Arguments: none + +Write out the PRNG pool's content into the registered seed file. + @item GCRYCTL_SET_VERBOSITY + + @item GCRYCTL_SET_DEBUG_FLAGS @item GCRYCTL_CLEAR_DEBUG_FLAGS @item GCRYCTL_DISABLE_INTERNAL_LOCKING @item GCRYCTL_ANY_INITIALIZATION_P @item GCRYCTL_INITIALIZATION_FINISHED_P @item GCRYCTL_INITIALIZATION_FINISHED -@item GCRYCTL_SET_THREAD_CBS + +@item GCRYCTL_SET_THREAD_CBS; Arguments: struct ath_ops *ath_ops + +This command registers a thread-callback structure. See section ``multi +threading'' for more information on this command. + @item GCRYCTL_FAST_POOL @end table @@ -1137,7 +1160,7 @@ AES (Rijndael) with a 128 bit key. @item GCRY_CIPHER_AES192 -@itemx GCRY_CIPHER_RIJNDAEL128 +@itemx GCRY_CIPHER_RIJNDAEL192 AES (Rijndael) with a 192 bit key. @item GCRY_CIPHER_AES256 @@ -1418,7 +1441,7 @@ @var{inlen} is @code{0}, in-place encryption of the data in @var{out} or length @var{outsize} takes place. With @var{in} being not @code{NULL}, @var{inlen} bytes are encrypted to the buffer @var{out} which must have -at least a size of @var{inlen}. @var{outlen} must be set to the +at least a size of @var{inlen}. @var{outsize} must be set to the allocated size of @var{out}, so that the function can check that there is sufficient space. Note, that overlapping buffers are not allowed. @@ -1438,7 +1461,7 @@ @var{inlen} is @code{0}, in-place decryption of the data in @var{out} or length @var{outsize} takes place. With @var{in} being not @code{NULL}, @var{inlen} bytes are decrypted to the buffer @var{out} which must have -at least a size of @var{inlen}. @var{outlen} must be set to the +at least a size of @var{inlen}. @var{outsize} must be set to the allocated size of @var{out}, so that the function can check that there is sufficient space. Note, that overlapping buffers are not allowed. @@ -3022,7 +3045,7 @@ @example @{ gcry_ac_key_pair_t key_pair; - gcry_ac_key_spec_rsa rsa_spec; + gcry_ac_key_spec_rsa_t rsa_spec; rsa_spec.e = gcry_mpi_new (0); gcry_mpi_set_ui (rsa_spec.e, 1) @@ -3091,7 +3114,7 @@ are then forwared to the cryptographic primitives. Since schemes are to be used for a special purpose in order to achieve a particular security goal, there exist ``encryption schemes'' and ``signature -schemes''. Encoding methods can be used seperately or implicitely +schemes''. Encoding methods can be used seperately or implicitly through schemes. What follows is a description of the cryptographic primitives. @@ -3390,8 +3413,8 @@ The next argument is expected to be of type @code{char *} and that string is inserted into the resulting S-expression. @item %d -The next argument is expected to be of type @code{int} and its -value ist inserted into the resulting S-expression. +The next argument is expected to be of type @code{int} and its value is +inserted into the resulting S-expression. @item %b The next argument is expected to be of type @code{int} directly followed by an argument of type @code{char *}. This represents a @@ -3649,7 +3672,7 @@ The following functions are used to convert between an external representation of an MPI and the internal one of @acronym{Libgcrypt}. -@deftypefun int gcry_mpi_scan (@w{gcry_mpi_t *@var{r_mpi}}, @w{enum gcry_mpi_format @var{format}}, @w{const unsigned char *@var{buffer}}, @w{size_t @var{buflen}}, @w{size_t *@var{nscanned}}) +@deftypefun gcry_error_t gcry_mpi_scan (@w{gcry_mpi_t *@var{r_mpi}}, @w{enum gcry_mpi_format @var{format}}, @w{const unsigned char *@var{buffer}}, @w{size_t @var{buflen}}, @w{size_t *@var{nscanned}}) Convert the external representation of an integer stored in @var{buffer} with a length of @var{buflen} into a newly created MPI returned which @@ -3686,7 +3709,7 @@ @end deftypefun -@deftypefun int gcry_mpi_print (@w{enum gcry_mpi_format @var{format}}, @w{unsigned char *@var{buffer}}, @w{size_t @var{buflen}}, @w{size_t *@var{nwritten}}, @w{const gcry_mpi_t @var{a}}) +@deftypefun gcry_error_t gcry_mpi_print (@w{enum gcry_mpi_format @var{format}}, @w{unsigned char *@var{buffer}}, @w{size_t @var{buflen}}, @w{size_t *@var{nwritten}}, @w{const gcry_mpi_t @var{a}}) Convert the MPI @var{a} into an external representation described by @var{format} (see above) and store it in the provided @var{buffer} @@ -3695,7 +3718,7 @@ actually stored in @var{buffer} after a successful operation. @end deftypefun -@deftypefun int gcry_mpi_aprint (@w{enum gcry_mpi_format @var{format}}, @w{unsigned char **@var{buffer}}, @w{size_t *@var{nbytes}}, @w{const gcry_mpi_t @var{a}}) +@deftypefun gcry_error_t gcry_mpi_aprint (@w{enum gcry_mpi_format @var{format}}, @w{unsigned char **@var{buffer}}, @w{size_t *@var{nbytes}}, @w{const gcry_mpi_t @var{a}}) Convert the MPI @var{a} into an external representation described by @var{format} (see above) and store it in a newly allocated buffer which From cvs at cvs.gnupg.org Wed Jan 11 20:28:08 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Wed Jan 11 19:49:37 2006 Subject: [svn] gpg-error - r154 - in trunk: . po Message-ID: Author: wk Date: 2006-01-11 20:28:08 +0100 (Wed, 11 Jan 2006) New Revision: 154 Modified: trunk/AUTHORS trunk/NEWS trunk/po/ChangeLog trunk/po/LINGUAS Log: Add Vietnamese translation Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2005-11-02 10:10:28 UTC (rev 153) +++ trunk/AUTHORS 2006-01-11 19:28:08 UTC (rev 154) @@ -11,8 +11,11 @@ Laurentiu Buzdugan - TRANSLATION [ro] +Clytie Siddall + - TRANSLATION [vi] + The RPM specs file libgpg-error.spec has been contributed by Robert Schiele Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2005-11-02 10:10:28 UTC (rev 153) +++ trunk/NEWS 2006-01-11 19:28:08 UTC (rev 154) @@ -14,7 +14,7 @@ * New error code GPG_ERR_LOCKED. - * New translations included for France and Romania. + * New translations included for France, Romania, and Vietnamese. * Interface changes relative to the 1.1 release: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2005-11-02 10:10:28 UTC (rev 153) +++ trunk/po/ChangeLog 2006-01-11 19:28:08 UTC (rev 154) @@ -1,3 +1,8 @@ +2006-01-11 Werner Koch + + * vi.po: New. + * LINGUAS: Add vi. + 2005-09-29 Marcus Brinkmann * fr.po: New file. Modified: trunk/po/LINGUAS =================================================================== --- trunk/po/LINGUAS 2005-11-02 10:10:28 UTC (rev 153) +++ trunk/po/LINGUAS 2006-01-11 19:28:08 UTC (rev 154) @@ -3,3 +3,4 @@ pl ro fr +vi From cvs at cvs.gnupg.org Mon Jan 16 13:01:19 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Mon Jan 16 12:22:18 2006 Subject: [svn] GPGol - r136 - in trunk: . po src Message-ID: Author: wk Date: 2006-01-16 13:01:18 +0100 (Mon, 16 Jan 2006) New Revision: 136 Modified: trunk/NEWS trunk/configure.ac trunk/po/de.po trunk/src/ChangeLog trunk/src/gpgol-rsrcs.rc trunk/src/verify-dialog.c Log: Fixed 2 usability bugs Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2006-01-02 08:51:34 UTC (rev 135) +++ trunk/NEWS 2006-01-16 12:01:18 UTC (rev 136) @@ -1,3 +1,7 @@ +Noteworthy changes for version 0.9.6 +================================================= + + Noteworthy changes for version 0.9.5 (2005-12-07) ================================================= Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-01-02 08:51:34 UTC (rev 135) +++ trunk/configure.ac 2006-01-16 12:01:18 UTC (rev 136) @@ -16,7 +16,7 @@ # Version number: Remember to change it immediately *after* a release. # Make sure to run "svn up" before a "make dist". # Add a "-cvs" prefix for non-released code. -AC_INIT(gpgol, 0.9.5, bug-gpgol@g10code.com) +AC_INIT(gpgol, 0.9.6-cvs, bug-gpgol@g10code.com) NEED_GPGME_API=1 NEED_GPGME_VERSION=1.1.0 Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-01-02 08:51:34 UTC (rev 135) +++ trunk/po/de.po 2006-01-16 12:01:18 UTC (rev 136) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: GPGol 0.9.4\n" "Report-Msgid-Bugs-To: bug-gpgol@g10code.com\n" -"POT-Creation-Date: 2005-12-07 17:27+0100\n" -"PO-Revision-Date: 2005-12-07 17:31+0100\n" +"POT-Creation-Date: 2006-01-16 12:15+0100\n" +"PO-Revision-Date: 2006-01-16 12:16+0100\n" "Last-Translator: Werner Koch \n" "Language-Team: de\n" "MIME-Version: 1.0\n" @@ -430,19 +430,23 @@ msgstr "Ãœberprüfungsfehler" #: src/verify-dialog.c:164 +msgid "This may be due to a wrong option setting" +msgstr "Möglicherweise durch falsche Einstellungen verursacht" + +#: src/verify-dialog.c:170 #, c-format msgid "Signature expired on %s" msgstr "Unterschrift abgelaufen am %s" -#: src/verify-dialog.c:176 +#: src/verify-dialog.c:182 msgid "Signature issued by a key we do NOT trust." msgstr "Die Unterschrift stammt von einem Schlüssel dem wir NICHT vertrauen." -#: src/verify-dialog.c:183 +#: src/verify-dialog.c:189 msgid "Signature issued by a non-valid key." msgstr "Die Unterschrift stammt von einem ungültigen Schlüssel." -#: src/verify-dialog.c:205 +#: src/verify-dialog.c:211 msgid "Verification Result" msgstr "Prüfungsresultat" Modified: trunk/src/ChangeLog =================================================================== --- trunk/src/ChangeLog 2006-01-02 08:51:34 UTC (rev 135) +++ trunk/src/ChangeLog 2006-01-16 12:01:18 UTC (rev 136) @@ -1,3 +1,10 @@ +2006-01-16 Werner Koch + + * verify-dialog.c (load_sigbox): Give a hint in case of a bad + signature. + + * gpgol-rsrcs.rc (IDD_ENC_DE): Add an informational header. + 2005-12-07 Werner Koch * olflange.cpp (Install): Cehck the version and print a warning. Modified: trunk/src/gpgol-rsrcs.rc =================================================================== --- trunk/src/gpgol-rsrcs.rc 2006-01-02 08:51:34 UTC (rev 135) +++ trunk/src/gpgol-rsrcs.rc 2006-01-16 12:01:18 UTC (rev 136) @@ -47,11 +47,13 @@ BEGIN CONTROL "List1",IDC_ENC_RSET1,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,8,4,314,92 + LTEXT "Ausgewählte Empfänger:",IDC_STATIC, + 8,98,130,8 CONTROL "List2",IDC_ENC_RSET2,"SysListView32",LVS_REPORT | - WS_BORDER | WS_TABSTOP,8,98,313,49 - LTEXT "Empfänger die NICHT gefunden wurden",IDC_ENC_INFO,8,149, - 128,8 - LISTBOX IDC_ENC_NOTFOUND,8,158,313,22,LBS_SORT | + WS_BORDER | WS_TABSTOP,8,110,313,49 + LTEXT "Empfänger die NICHT gefunden wurden:",IDC_ENC_INFO, + 8,161,128,8 + LISTBOX IDC_ENC_NOTFOUND,8,170,313,22,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "&OK",IDOK,221,196,50,14 PUSHBUTTON "&Abbrechen",IDCANCEL,273,196,50,14 Modified: trunk/src/verify-dialog.c =================================================================== --- trunk/src/verify-dialog.c 2006-01-02 08:51:34 UTC (rev 135) +++ trunk/src/verify-dialog.c 2006-01-16 12:01:18 UTC (rev 136) @@ -157,8 +157,14 @@ SetDlgItemText (dlg, IDC_VRY_PKALGO, s); valid = ctx->signatures->validity; - if (stat & GPGME_SIGSUM_SIG_EXPIRED) + if (stat & GPGME_SIGSUM_RED) { + /* This is a BAD signature; give a hint to the user. */ + SetDlgItemText (dlg, IDC_VRY_HINT, + _("This may be due to a wrong option setting")); + } + else if (stat & GPGME_SIGSUM_SIG_EXPIRED) + { const char *fmt; fmt = _("Signature expired on %s"); From cvs at cvs.gnupg.org Mon Jan 16 18:59:47 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Mon Jan 16 18:20:48 2006 Subject: [svn] GnuPG - r3986 - trunk/keyserver Message-ID: Author: dshaw Date: 2006-01-16 18:59:46 +0100 (Mon, 16 Jan 2006) New Revision: 3986 Modified: trunk/keyserver/ChangeLog trunk/keyserver/gpgkeys_hkp.c Log: * gpgkeys_hkp.c (send_key): Do not escape the '=' in the HTTP POST when uploading a key. Modified: trunk/keyserver/ChangeLog =================================================================== --- trunk/keyserver/ChangeLog 2006-01-07 21:04:13 UTC (rev 3985) +++ trunk/keyserver/ChangeLog 2006-01-16 17:59:46 UTC (rev 3986) @@ -1,3 +1,8 @@ +2006-01-16 David Shaw + + * gpgkeys_hkp.c (send_key): Do not escape the '=' in the HTTP POST + when uploading a key. + 2005-12-23 David Shaw * ksutil.h, ksutil.c (parse_ks_options): New keyserver command Modified: trunk/keyserver/gpgkeys_hkp.c =================================================================== --- trunk/keyserver/gpgkeys_hkp.c 2006-01-07 21:04:13 UTC (rev 3985) +++ trunk/keyserver/gpgkeys_hkp.c 2006-01-16 17:59:46 UTC (rev 3986) @@ -88,19 +88,9 @@ int begin=0,end=0,ret=KEYSERVER_INTERNAL_ERROR; char keyid[17]; char line[MAX_LINE]; - char *key,*encoded_key=NULL; - size_t keylen=8,keymax=8; + char *key=NULL,*encoded_key=NULL; + size_t keylen=0,keymax=0; - key=malloc(9); - if(!key) - { - fprintf(console,"gpgkeys: out of memory\n"); - ret=KEYSERVER_NO_MEMORY; - goto fail; - } - - strcpy(key,"keytext="); - /* Read and throw away input until we see the BEGIN */ while(fgets(line,MAX_LINE,input)!=NULL) @@ -166,6 +156,19 @@ goto fail; } + free(key); + + key=malloc(8+strlen(encoded_key)+1); + if(!key) + { + fprintf(console,"gpgkeys: out of memory\n"); + ret=KEYSERVER_NO_MEMORY; + goto fail; + } + + strcpy(key,"keytext="); + strcat(key,encoded_key); + strcpy(request,"http://"); strcat(request,opt->host); strcat(request,":"); @@ -183,7 +186,7 @@ curl_easy_setopt(curl,CURLOPT_URL,request); curl_easy_setopt(curl,CURLOPT_POST,1); - curl_easy_setopt(curl,CURLOPT_POSTFIELDS,encoded_key); + curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key); curl_easy_setopt(curl,CURLOPT_FAILONERROR,1); res=curl_easy_perform(curl); From cvs at cvs.gnupg.org Mon Jan 16 21:22:59 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Mon Jan 16 20:43:57 2006 Subject: [svn] GnuPG - r3987 - trunk/m4 Message-ID: Author: dshaw Date: 2006-01-16 21:22:58 +0100 (Mon, 16 Jan 2006) New Revision: 3987 Modified: trunk/m4/ChangeLog trunk/m4/libcurl.m4 Log: * libcurl.m4: Remove GOPHER, as that is not supported in libcurl any longer. Modified: trunk/m4/ChangeLog =================================================================== --- trunk/m4/ChangeLog 2006-01-16 17:59:46 UTC (rev 3986) +++ trunk/m4/ChangeLog 2006-01-16 20:22:58 UTC (rev 3987) @@ -1,3 +1,8 @@ +2006-01-16 David Shaw + + * libcurl.m4: Remove GOPHER, as that is not supported in libcurl + any longer. + 2005-11-05 David Shaw * libusb.m4: Check for libusb-config and if we find it, use --libs Modified: trunk/m4/libcurl.m4 =================================================================== --- trunk/m4/libcurl.m4 2006-01-16 17:59:46 UTC (rev 3986) +++ trunk/m4/libcurl.m4 2006-01-16 20:22:58 UTC (rev 3987) @@ -1,7 +1,7 @@ # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], # [ACTION-IF-YES], [ACTION-IF-NO]) # ---------------------------------------------------------- -# David Shaw Aug-5-2005 +# David Shaw Jan-16-2006 # # Checks for libcurl. DEFAULT-ACTION is the string yes or no to # specify whether to default to --with-libcurl or --without-libcurl. @@ -33,7 +33,7 @@ # curl-config script. Note that it is very important for people # packaging binary versions of libcurl to include this script! # Without curl-config, we can only guess what protocols are available, -# (or use curl_version_info to figure it out at runtime). +# or use curl_version_info to figure it out at runtime. AC_DEFUN([LIBCURL_CHECK_CONFIG], [ @@ -47,7 +47,6 @@ AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP]) AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS]) - AH_TEMPLATE([LIBCURL_PROTOCOL_GOPHER],[Defined if libcurl supports GOPHER]) AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE]) AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) @@ -191,7 +190,7 @@ # We don't have --protocols, so just assume that all # protocols are available - _libcurl_protocols="HTTP FTP GOPHER FILE TELNET LDAP DICT" + _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT" if test x$libcurl_feature_SSL = xyes ; then _libcurl_protocols="$_libcurl_protocols HTTPS" From cvs at cvs.gnupg.org Tue Jan 17 17:03:52 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Tue Jan 17 16:24:44 2006 Subject: [svn] GnuPG - r3988 - trunk/m4 Message-ID: Author: dshaw Date: 2006-01-17 17:03:51 +0100 (Tue, 17 Jan 2006) New Revision: 3988 Modified: trunk/m4/ChangeLog trunk/m4/libcurl.m4 Log: * libcurl.m4: Add IDN, SSPI, NTLM, and TFTP defines. Modified: trunk/m4/ChangeLog =================================================================== --- trunk/m4/ChangeLog 2006-01-16 20:22:58 UTC (rev 3987) +++ trunk/m4/ChangeLog 2006-01-17 16:03:51 UTC (rev 3988) @@ -1,3 +1,7 @@ +2006-01-17 David Shaw + + * libcurl.m4: Add IDN, SSPI, NTLM, and TFTP defines. + 2006-01-16 David Shaw * libcurl.m4: Remove GOPHER, as that is not supported in libcurl Modified: trunk/m4/libcurl.m4 =================================================================== --- trunk/m4/libcurl.m4 2006-01-16 20:22:58 UTC (rev 3987) +++ trunk/m4/libcurl.m4 2006-01-17 16:03:51 UTC (rev 3988) @@ -1,7 +1,7 @@ # LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION], # [ACTION-IF-YES], [ACTION-IF-NO]) # ---------------------------------------------------------- -# David Shaw Jan-16-2006 +# David Shaw Jan-17-2006 # # Checks for libcurl. DEFAULT-ACTION is the string yes or no to # specify whether to default to --with-libcurl or --without-libcurl. @@ -13,10 +13,10 @@ # ACTION-IF-NO is a list of shell commands that are run otherwise. # Note that using --without-libcurl does run ACTION-IF-NO. # -# This macro defines HAVE_LIBCURL if a working libcurl setup is found, -# and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary values. -# Other useful defines are LIBCURL_FEATURE_xxx where xxx are the -# various features supported by libcurl, and LIBCURL_PROTOCOL_yyy +# This macro #defines HAVE_LIBCURL if a working libcurl setup is +# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary +# values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are +# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy # where yyy are the various protocols supported by libcurl. Both xxx # and yyy are capitalized. See the list of AH_TEMPLATEs at the top of # the macro for the complete list of possible defines. Shell @@ -42,6 +42,9 @@ AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6]) AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz]) AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS]) + AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN]) + AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI]) + AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM]) AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP]) AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS]) @@ -51,6 +54,7 @@ AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET]) AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP]) AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT]) + AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP]) AC_ARG_WITH(libcurl, AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]), @@ -142,7 +146,6 @@ missing symbols or can't link. */ int x; curl_easy_setopt(NULL,CURLOPT_URL,NULL); -curl_version_info(CURLVERSION_NOW); x=CURL_ERROR_SIZE; x=CURLOPT_WRITEFUNCTION; x=CURLOPT_FILE; From cvs at cvs.gnupg.org Tue Jan 17 21:55:56 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Tue Jan 17 21:16:47 2006 Subject: [svn] GnuPG - r3989 - trunk/g10 Message-ID: Author: dshaw Date: 2006-01-17 21:55:53 +0100 (Tue, 17 Jan 2006) New Revision: 3989 Modified: trunk/g10/ChangeLog trunk/g10/keydb.h trunk/g10/passphrase.c trunk/g10/pubkey-enc.c Log: * keydb.h, passphrase.c (next_to_last_passphrase): New. "Touch" a passphrase as if it was used (move from next_pw to last_pw). * pubkey-enc.c (get_session_key): Use it here to handle the case where a passphrase happens to be correct for a secret key, but yet that key isn't the anonymous recipient (i.e. the secret key could be decrypted, but not the session key). This also handles the case where a secret key is located on a card and a secret key with no passphrase. Note this does not fix bug 594 (anonymous recipients on smartcard do not work) - it just prevents the anonymous search from stopping when the card is encountered. Modified: trunk/g10/ChangeLog =================================================================== --- trunk/g10/ChangeLog 2006-01-17 16:03:51 UTC (rev 3988) +++ trunk/g10/ChangeLog 2006-01-17 20:55:53 UTC (rev 3989) @@ -1,3 +1,17 @@ +2006-01-17 David Shaw + + * keydb.h, passphrase.c (next_to_last_passphrase): New. "Touch" a + passphrase as if it was used (move from next_pw to last_pw). + + * pubkey-enc.c (get_session_key): Use it here to handle the case + where a passphrase happens to be correct for a secret key, but yet + that key isn't the anonymous recipient (i.e. the secret key could + be decrypted, but not the session key). This also handles the + case where a secret key is located on a card and a secret key with + no passphrase. Note this does not fix bug 594 (anonymous + recipients on smartcard do not work) - it just prevents the + anonymous search from stopping when the card is encountered. + 2006-01-07 David Shaw * keyserver.c (keyserver_refresh): Fix problem when more than one Modified: trunk/g10/keydb.h =================================================================== --- trunk/g10/keydb.h 2006-01-17 16:03:51 UTC (rev 3988) +++ trunk/g10/keydb.h 2006-01-17 20:55:53 UTC (rev 3989) @@ -211,6 +211,7 @@ const char *tryagain_text, int *canceled); void set_next_passphrase( const char *s ); char *get_last_passphrase(void); +void next_to_last_passphrase(void); /*-- getkey.c --*/ int classify_user_id( const char *name, KEYDB_SEARCH_DESC *desc); Modified: trunk/g10/passphrase.c =================================================================== --- trunk/g10/passphrase.c 2006-01-17 16:03:51 UTC (rev 3988) +++ trunk/g10/passphrase.c 2006-01-17 20:55:53 UTC (rev 3989) @@ -55,24 +55,6 @@ #include "assuan.h" #endif /*ENABLE_AGENT_SUPPORT*/ - -#define buftou32( p ) ((*(byte*)(p) << 24) | (*((byte*)(p)+1)<< 16) | \ - (*((byte*)(p)+2) << 8) | (*((byte*)(p)+3))) -#define u32tobuf( p, a ) do { \ - ((byte*)p)[0] = (byte)((a) >> 24); \ - ((byte*)p)[1] = (byte)((a) >> 16); \ - ((byte*)p)[2] = (byte)((a) >> 8); \ - ((byte*)p)[3] = (byte)((a) ); \ - } while(0) - -#define digitp(p) (*(p) >= '0' && *(p) <= '9') -#define hexdigitp(a) (digitp (a) \ - || (*(a) >= 'A' && *(a) <= 'F') \ - || (*(a) >= 'a' && *(a) <= 'f')) -#define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \ - *(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10)) -#define xtoi_2(p) ((xtoi_1(p) * 16) + xtoi_1((p)+1)) - static char *fd_passwd = NULL; static char *next_pw = NULL; static char *last_pw = NULL; @@ -115,6 +97,17 @@ return p; } +/* As if we had used the passphrase - make it the last_pw. */ +void +next_to_last_passphrase(void) +{ + if(next_pw) + { + last_pw=next_pw; + next_pw=NULL; + } +} + /* Here's an interesting question: since this passphrase was passed in on the command line, is there really any point in using secure memory for it? I'm going with 'yes', since it doesn't hurt, and Modified: trunk/g10/pubkey-enc.c =================================================================== --- trunk/g10/pubkey-enc.c 2006-01-17 16:03:51 UTC (rev 3988) +++ trunk/g10/pubkey-enc.c 2006-01-17 20:55:53 UTC (rev 3989) @@ -115,11 +115,26 @@ only once */ if( !rc ) + { rc = get_it( k, dek, sk, keyid ); - if( !rc ) { + /* Successfully checked the secret key (either it was + a card, had no passphrase, or had the right + passphrase) but couldn't decrypt the session key, + so thus that key is not the anonymous recipient. + Move the next passphrase into last for the next + round. We only do this if the secret key was + successfully checked as in the normal case, + check_secret_key handles this for us via + passphrase_to_dek */ + if(rc) + next_to_last_passphrase(); + } + + if( !rc ) + { log_info(_("okay, we are the anonymous recipient.\n") ); break; - } + } } enum_secret_keys( &enum_context, NULL, 0, 0 ); /* free context */ } From cvs at cvs.gnupg.org Sun Jan 22 22:38:02 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Sun Jan 22 21:58:23 2006 Subject: [svn] GnuPG - r3990 - trunk Message-ID: Author: dshaw Date: 2006-01-22 22:38:02 +0100 (Sun, 22 Jan 2006) New Revision: 3990 Modified: trunk/ChangeLog trunk/configure.ac Log: * configure.ac: Add define for EXEEXT so we can find keyserver helpers on systems that use extensions. Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-01-17 20:55:53 UTC (rev 3989) +++ trunk/ChangeLog 2006-01-22 21:38:02 UTC (rev 3990) @@ -1,3 +1,8 @@ +2006-01-22 David Shaw + + * configure.ac: Add define for EXEEXT so we can find keyserver + helpers on systems that use extensions. + 2005-12-23 David Shaw * configure.ac: Add switch for DNS CERT. Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-01-17 20:55:53 UTC (rev 3989) +++ trunk/configure.ac 2006-01-22 21:38:02 UTC (rev 3990) @@ -537,6 +537,9 @@ GNUPG_SYS_SYMBOL_UNDERSCORE dnl These need to go after AC_PROG_CC so that $EXEEXT is defined + +AC_DEFINE_UNQUOTED(EXEEXT,"$EXEEXT",[The executable file extension, if any]) + if test x"$try_hkp" = xyes ; then AC_SUBST(GPGKEYS_HKP,"gpgkeys_hkp$EXEEXT") fi From cvs at cvs.gnupg.org Sun Jan 22 22:40:27 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Sun Jan 22 22:00:47 2006 Subject: [svn] GnuPG - r3991 - trunk/g10 Message-ID: Author: dshaw Date: 2006-01-22 22:40:20 +0100 (Sun, 22 Jan 2006) New Revision: 3991 Modified: trunk/g10/ChangeLog trunk/g10/keyserver.c trunk/g10/misc.c Log: * keyserver.c (keyserver_spawn): Include the EXEEXT so we can find keyserver helpers on systems that use extensions. * misc.c (path_access) [HAVE_DRIVE_LETTERS]: Do the right thing with drive letter systems. Modified: trunk/g10/ChangeLog =================================================================== --- trunk/g10/ChangeLog 2006-01-22 21:38:02 UTC (rev 3990) +++ trunk/g10/ChangeLog 2006-01-22 21:40:20 UTC (rev 3991) @@ -1,3 +1,11 @@ +2006-01-22 David Shaw + + * keyserver.c (keyserver_spawn): Include the EXEEXT so we can find + keyserver helpers on systems that use extensions. + + * misc.c (path_access) [HAVE_DRIVE_LETTERS]: Do the right thing + with drive letter systems. + 2006-01-17 David Shaw * keydb.h, passphrase.c (next_to_last_passphrase): New. "Touch" a Modified: trunk/g10/keyserver.c =================================================================== --- trunk/g10/keyserver.c 2006-01-22 21:38:02 UTC (rev 3990) +++ trunk/g10/keyserver.c 2006-01-22 21:40:20 UTC (rev 3991) @@ -946,7 +946,7 @@ /* If exec-path was set, and DISABLE_KEYSERVER_PATH is undefined, then don't specify a full path to gpgkeys_foo, so that the PATH can work. */ - command=xmalloc(GPGKEYS_PREFIX_LEN+strlen(scheme)+3+1); + command=xmalloc(GPGKEYS_PREFIX_LEN+strlen(scheme)+3+strlen(EXEEXT)+1); command[0]='\0'; } else @@ -954,7 +954,7 @@ { /* Specify a full path to gpgkeys_foo. */ command=xmalloc(strlen(libexecdir)+strlen(DIRSEP_S)+ - GPGKEYS_PREFIX_LEN+strlen(scheme)+3+1); + GPGKEYS_PREFIX_LEN+strlen(scheme)+3+strlen(EXEEXT)+1); strcpy(command,libexecdir); strcat(command,DIRSEP_S); } @@ -967,6 +967,8 @@ if(keyserver->flags.direct_uri) strcat(command,"uri"); + strcat(command,EXEEXT); + #ifdef GPGKEYS_CURL if(!curl_cant_handle(scheme,keyserver->flags.direct_uri) && path_access(command,X_OK)!=0) Modified: trunk/g10/misc.c =================================================================== --- trunk/g10/misc.c 2006-01-22 21:38:02 UTC (rev 3990) +++ trunk/g10/misc.c 2006-01-22 21:40:20 UTC (rev 3991) @@ -1251,7 +1251,15 @@ envpath=getenv("PATH"); - if(file[0]=='/' || !envpath) + if(!envpath +#ifdef HAVE_DRIVE_LETTERS + || (((file[0]>='A' && file[0]<='Z') + || (file[0]>='a' && file[0]<='z')) + && file[1]==':') +#else + || file[0]=='/' +#endif + ) return access(file,mode); else { From cvs at cvs.gnupg.org Tue Jan 24 21:06:03 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Tue Jan 24 20:26:14 2006 Subject: [svn] gpg-error - r155 - trunk/po Message-ID: Author: wk Date: 2006-01-24 21:06:03 +0100 (Tue, 24 Jan 2006) New Revision: 155 Added: trunk/po/vi.po Log: Add file Added: trunk/po/vi.po =================================================================== --- trunk/po/vi.po 2006-01-11 19:28:08 UTC (rev 154) +++ trunk/po/vi.po 2006-01-24 20:06:03 UTC (rev 155) @@ -0,0 +1,917 @@ +# Vietnamese translation for Lib. GPG Error. +# Copyright ? 2006 Free Software Foundation, Inc. +# Clytie Siddall , 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: libgpg-error-1.1\n" +"Report-Msgid-Bugs-To: translations@gnupg.org\n" +"POT-Creation-Date: 2004-07-30 14:49+0200\n" +"PO-Revision-Date: 2006-01-08 16:33+1030\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: LocFactoryEditor 1.5.1b\n" + +#: src/err-sources.h:28 +msgid "Unspecified source" +msgstr "Ngu?n ch?a ghi r?" + +#: src/err-sources.h:29 +msgid "gcrypt" +msgstr "gcrypt" + +#: src/err-sources.h:30 +msgid "GnuPG" +msgstr "GnuPG" + +#: src/err-sources.h:31 +msgid "GpgSM" +msgstr "GpgSM" + +#: src/err-sources.h:32 +msgid "GPG Agent" +msgstr "T?c nh?n GPG" + +#: src/err-sources.h:33 +msgid "Pinentry" +msgstr "Pinentry" + +#: src/err-sources.h:34 +msgid "SCD" +msgstr "SCD" + +#: src/err-sources.h:35 +msgid "GPGME" +msgstr "GPGME" + +#: src/err-sources.h:36 +msgid "Keybox" +msgstr "Keybox" + +#: src/err-sources.h:37 +msgid "KSBA" +msgstr "KSBA" + +#: src/err-sources.h:38 +msgid "Dirmngr" +msgstr "Dirmngr" + +#: src/err-sources.h:39 +msgid "GSTI" +msgstr "GSTI" + +#: src/err-sources.h:40 +msgid "User defined source 1" +msgstr "Ngu?n t? ??nh ngh?a 1" + +#: src/err-sources.h:41 +msgid "User defined source 2" +msgstr "Ngu?n t? ??nh ngh?a 2" + +#: src/err-sources.h:42 +msgid "User defined source 3" +msgstr "Ngu?n t? ??nh ngh?a 3" + +#: src/err-sources.h:43 +msgid "User defined source 4" +msgstr "Ngu?n t? ??nh ngh?a 4" + +#: src/err-sources.h:44 +msgid "Unknown source" +msgstr "Ngu?n l?" + +#: src/err-codes.h:28 +msgid "Success" +msgstr "Th?nh c?ng" + +#: src/err-codes.h:29 +msgid "General error" +msgstr "L?i chung" + +#: src/err-codes.h:30 +msgid "Unknown packet" +msgstr "G?i tin l?" + +#: src/err-codes.h:31 +msgid "Unknown version in packet" +msgstr "G?p phi?n b?n l? trong g?i tin" + +#: src/err-codes.h:32 +msgid "Invalid public key algorithm" +msgstr "Thu?t to?n kh?a c?ng kh?ng h?p l?" + +#: src/err-codes.h:33 +msgid "Invalid digest algorithm" +msgstr "Thu?t to?n b? t?m t?t (digest) kh?ng h?p l?" + +#: src/err-codes.h:34 +msgid "Bad public key" +msgstr "Kh?a c?ng sai" + +#: src/err-codes.h:35 +msgid "Bad secret key" +msgstr "Kh?a b? m?t sai" + +#: src/err-codes.h:36 +msgid "Bad signature" +msgstr "Ch? k? sai" + +#: src/err-codes.h:37 +msgid "No public key" +msgstr "Kh?ng c? kh?a c?ng" + +#: src/err-codes.h:38 +msgid "Checksum error" +msgstr "L?i t?ng ki?m tra (checksum)" + +#: src/err-codes.h:39 +msgid "Bad passphrase" +msgstr "C?m t? m?t kh?u sai" + +#: src/err-codes.h:40 +msgid "Invalid cipher algorithm" +msgstr "Thu?t to?n m?t m? kh?ng h?p l?" + +#: src/err-codes.h:41 +msgid "Keyring open" +msgstr "V?ng ch?a kh?a ?? m?" + +#: src/err-codes.h:42 +msgid "Invalid packet" +msgstr "G?i tin kh?ng h?p l?" + +#: src/err-codes.h:43 +msgid "Invalid armor" +msgstr "B?c s?t kh?ng h?p l?" + +#: src/err-codes.h:44 +msgid "No user ID" +msgstr "Kh?ng c? ID ng??i d?ng" + +#: src/err-codes.h:45 +msgid "No secret key" +msgstr "Kh?ng c? kh?a b? m?t" + +#: src/err-codes.h:46 +msgid "Wrong secret key used" +msgstr "?? d?ng kh?a b? m?t kh?ng ??ng" + +#: src/err-codes.h:47 +msgid "Bad session key" +msgstr "Kh?a phi?n ch?y sai" + +#: src/err-codes.h:48 +msgid "Unknown compression algorithm" +msgstr "Thu?t to?n n?n l?" + +#: src/err-codes.h:49 +msgid "Number is not prime" +msgstr "S? kh?ng ph?i nguy?n t?" + +#: src/err-codes.h:50 +msgid "Invalid encoding method" +msgstr "Ph??ng ph?p m? h?a kh?ng h?p l?" + +#: src/err-codes.h:51 +msgid "Invalid encryption scheme" +msgstr "L??c ?? m?t m? h?a kh?ng h?p l?" + +#: src/err-codes.h:52 +msgid "Invalid signature scheme" +msgstr "L??c ?? ch? k? kh?ng h?p l?" + +#: src/err-codes.h:53 +msgid "Invalid attribute" +msgstr "Thu?c t?nh kh?ng h?p l?" + +#: src/err-codes.h:54 +msgid "No value" +msgstr "Kh?ng c? gi? tr?" + +#: src/err-codes.h:55 +msgid "Not found" +msgstr "Kh?ng t?m th?y" + +#: src/err-codes.h:56 +msgid "Value not found" +msgstr "Kh?ng t?m th?y gi? tr?" + +#: src/err-codes.h:57 +msgid "Syntax error" +msgstr "L?i c? ph?p" + +#: src/err-codes.h:58 +msgid "Bad MPI value" +msgstr "Gi? tr? MPI sai" + +#: src/err-codes.h:59 +msgid "Invalid passphrase" +msgstr "C?m t? m?t kh?u kh?ng h?p l?" + +#: src/err-codes.h:60 +msgid "Invalid signature class" +msgstr "H?ng ch? k? kh?ng h?p l?" + +#: src/err-codes.h:61 +msgid "Resources exhausted" +msgstr "H?t ti?m n?ng ho?n to?n" + +#: src/err-codes.h:62 +msgid "Invalid keyring" +msgstr "V?ng chia kh?a kh?ng h?p l?" + +#: src/err-codes.h:63 +msgid "Trust DB error" +msgstr "L?i DB tin c?y" + +#: src/err-codes.h:64 +msgid "Bad certificate" +msgstr "Ch?ng nh?n sai" + +#: src/err-codes.h:65 +msgid "Invalid user ID" +msgstr "ID ng??i d?ng kh?ng h?p l?" + +#: src/err-codes.h:66 +msgid "Unexpected error" +msgstr "G?p l?i b?t ng?" + +#: src/err-codes.h:67 +msgid "Time conflict" +msgstr "Gi? xung ??t" + +#: src/err-codes.h:68 +msgid "Keyserver error" +msgstr "L?i m?y ph?c v? kh?a" + +#: src/err-codes.h:69 +msgid "Wrong public key algorithm" +msgstr "Thu?t to?n kh?a c?ng kh?ng ??ng" + +#: src/err-codes.h:70 +msgid "Tribute to D. A." +msgstr "C?ng cho D. A." + +#: src/err-codes.h:71 +msgid "Weak encryption key" +msgstr "Kh?a m?t m? y?u" + +#: src/err-codes.h:72 +msgid "Invalid key length" +msgstr "?? d?i kh?a kh?ng h?p l?" + +#: src/err-codes.h:73 +msgid "Invalid argument" +msgstr "??i s? kh?ng h?p l?" + +#: src/err-codes.h:74 +msgid "Syntax error in URI" +msgstr "L?i c? ph?p trong URI" + +#: src/err-codes.h:75 +msgid "Invalid URI" +msgstr "URI kh?ng h?p l?" + +#: src/err-codes.h:76 +msgid "Network error" +msgstr "L?i m?ng" + +#: src/err-codes.h:77 +msgid "Unknown host" +msgstr "M?y l?" + +#: src/err-codes.h:78 +msgid "Selftest failed" +msgstr "Vi?c t? ki?m tra b? l?i" + +#: src/err-codes.h:79 +msgid "Data not encrypted" +msgstr "Ch?a m?t m? d? li?u" + +#: src/err-codes.h:80 +msgid "Data not processed" +msgstr "Ch?a x? l? d? li?u" + +# Type: error +# Description +#: src/err-codes.h:81 +msgid "Unusable public key" +msgstr "Kh?a c?ng v? ?ch" + +# Type: error +# Description +#: src/err-codes.h:82 +msgid "Unusable secret key" +msgstr "Kh?a b? m?t v? ?ch" + +#: src/err-codes.h:83 +msgid "Invalid value" +msgstr "Gi? tr? kh?ng h?p l?" + +#: src/err-codes.h:84 +msgid "Bad certificate chain" +msgstr "D?y ch?ng nh?n sai" + +#: src/err-codes.h:85 +msgid "Missing certificate" +msgstr "Ch?ng nh?n c?n thi?u" + +#: src/err-codes.h:86 +msgid "No data" +msgstr "Kh?ng c? d? li?u" + +#: src/err-codes.h:87 +msgid "Bug" +msgstr "L?i" + +#: src/err-codes.h:88 +msgid "Not supported" +msgstr "Kh?ng ???c h? tr?" + +#: src/err-codes.h:89 +msgid "Invalid operation code" +msgstr "M? thao t?c kh?ng h?p l?" + +#: src/err-codes.h:90 +msgid "Timeout" +msgstr "Qu? gi?" + +#: src/err-codes.h:91 +msgid "Internal error" +msgstr "L?i n?i b?" + +#: src/err-codes.h:92 +msgid "EOF (gcrypt)" +msgstr "K?t th?c t?p tin (gcrypt)" + +#: src/err-codes.h:93 +msgid "Invalid object" +msgstr "??i t??ng kh?ng h?p l?" + +#: src/err-codes.h:94 +msgid "Provided object is too short" +msgstr "??i t??ng ?? cung c?p l? qu? ng?n" + +#: src/err-codes.h:95 +msgid "Provided object is too large" +msgstr "??i t??ng ?? cung c?p l? qu? l?n" + +#: src/err-codes.h:96 +msgid "Missing item in object" +msgstr "Thi?u m?c trong ??i t??ng" + +#: src/err-codes.h:97 +msgid "Not implemented" +msgstr "Kh?ng ???c th?c hi?n" + +#: src/err-codes.h:98 +msgid "Conflicting use" +msgstr "C?ch s? d?ng xung ??t" + +#: src/err-codes.h:99 +msgid "Invalid cipher mode" +msgstr "Ch? ?? m?t m? kh?ng h?p l?" + +#: src/err-codes.h:100 +msgid "Invalid flag" +msgstr "C? kh?ng h?p l?" + +#: src/err-codes.h:101 +msgid "Invalid handle" +msgstr "B? qu?n l? kh?ng h?p l?" + +#: src/err-codes.h:102 +msgid "Result truncated" +msgstr "K?t qu? b? c?t" + +#: src/err-codes.h:103 +msgid "Incomplete line" +msgstr "D?ng ch?a xong" + +#: src/err-codes.h:104 +msgid "Invalid response" +msgstr "??p ?ng kh?ng h?p l?" + +#: src/err-codes.h:105 +msgid "No agent running" +msgstr "Kh?ng c? t?c nh?n ?ang ch?y" + +#: src/err-codes.h:106 +msgid "agent error" +msgstr "L?i t?c nh?n" + +#: src/err-codes.h:107 +msgid "Invalid data" +msgstr "D? li?u kh?ng h?p l?" + +#: src/err-codes.h:108 +msgid "Assuan server fault" +msgstr "L?i m?y ph?c v? Assuan" + +#: src/err-codes.h:109 +msgid "Assuan error" +msgstr "L?i Assuan" + +#: src/err-codes.h:110 +msgid "Invalid session key" +msgstr "Kh?a phi?n ch?y kh?ng h?p l?" + +#: src/err-codes.h:111 +msgid "Invalid S-expression" +msgstr "Bi?u th?c S kh?ng h?p l?" + +#: src/err-codes.h:112 +msgid "Unsupported algorithm" +msgstr "Thu?t to?n kh?ng ???c h? tr?" + +#: src/err-codes.h:113 +msgid "No pinentry" +msgstr "Kh?ng c? pinentry" + +#: src/err-codes.h:114 +msgid "pinentry error" +msgstr "L?i pinentry" + +#: src/err-codes.h:115 +msgid "Bad PIN" +msgstr "PIN sai" + +#: src/err-codes.h:116 +msgid "Invalid name" +msgstr "T?n kh?ng h?p l?" + +#: src/err-codes.h:117 +msgid "Bad data" +msgstr "D? li?u sai" + +#: src/err-codes.h:118 +msgid "Invalid parameter" +msgstr "Tham s? kh?ng h?p l?" + +#: src/err-codes.h:119 +msgid "Wrong card" +msgstr "Th? kh?ng ??ng" + +#: src/err-codes.h:120 +msgid "No dirmngr" +msgstr "Kh?ng c? dirmngr" + +#: src/err-codes.h:121 +msgid "dirmngr error" +msgstr "L?i dirmngr" + +#: src/err-codes.h:122 +msgid "Certificate revoked" +msgstr "Ch?ng nh?n b? h?y b?" + +#: src/err-codes.h:123 +msgid "No CRL known" +msgstr "Kh?ng bi?t CRL n?o" + +#: src/err-codes.h:124 +msgid "CRL too old" +msgstr "CRL qu? c?" + +#: src/err-codes.h:125 +msgid "Line too long" +msgstr "D?ng qu? d?i" + +#: src/err-codes.h:126 +msgid "Not trusted" +msgstr "Kh?ng tin c?y" + +#: src/err-codes.h:127 +msgid "Operation cancelled" +msgstr "Thao t?c b? h?y b?" + +#: src/err-codes.h:128 +msgid "Bad CA certificate" +msgstr "Ch?ng nh?n CA sai" + +#: src/err-codes.h:129 +msgid "Certificate expired" +msgstr "Ch?ng nh?n qu? h?n" + +#: src/err-codes.h:130 +msgid "Certificate too young" +msgstr "Ch?ng nh?n qu? m?i" + +#: src/err-codes.h:131 +msgid "Unsupported certificate" +msgstr "Ch?ng nh?n kh?ng ???c h? tr?" + +#: src/err-codes.h:132 +msgid "Unknown S-expression" +msgstr "Bi?u th?c S l?" + +#: src/err-codes.h:133 +msgid "Unsupported protection" +msgstr "C?ch b?o v? kh?ng ???c h? tr?" + +#: src/err-codes.h:134 +msgid "Corrupted protection" +msgstr "C?ch b?o v? b? h?ng" + +#: src/err-codes.h:135 +msgid "Ambiguous name" +msgstr "T?n m? h?" + +#: src/err-codes.h:136 +msgid "Card error" +msgstr "L?i th?" + +#: src/err-codes.h:137 +msgid "Card reset required" +msgstr "C?n thi?t l?p l?i th?" + +#: src/err-codes.h:138 +msgid "Card removed" +msgstr "Th? b? g? b?" + +#: src/err-codes.h:139 +msgid "Invalid card" +msgstr "Th? kh?ng h?p l?" + +#: src/err-codes.h:140 +msgid "Card not present" +msgstr "Th? kh?ng ? ??y" + +#: src/err-codes.h:141 +msgid "No PKCS15 application" +msgstr "Kh?ng c? ?ng d?ng PKCS15" + +#: src/err-codes.h:142 +msgid "Not confirmed" +msgstr "Ch?a x?c nh?n" + +#: src/err-codes.h:143 +msgid "Configuration error" +msgstr "L?i c?u h?nh" + +#: src/err-codes.h:144 +msgid "No policy match" +msgstr "Kh?ng kh?p v?i ch?nh s?ch n?o" + +#: src/err-codes.h:145 +msgid "Invalid index" +msgstr "Ch? m?c kh?ng h?p l?" + +# Type: error +# Description +#: src/err-codes.h:146 +msgid "Invalid ID" +msgstr "ID kh?ng h?p l?" + +#: src/err-codes.h:147 +msgid "No SmartCard daemon" +msgstr "Kh?ng c? tr?nh n?n Th? Th?ng Minh" + +#: src/err-codes.h:148 +msgid "SmartCard daemon error" +msgstr "L?i tr?nh n?n Th? Th?ng Minh" + +#: src/err-codes.h:149 +msgid "Unsupported protocol" +msgstr "Giao th?c kh?ng ???c h? tr?" + +#: src/err-codes.h:150 +msgid "Bad PIN method" +msgstr "Ph??ng ph?p PIN sai" + +#: src/err-codes.h:151 +msgid "Card not initialized" +msgstr "Ch?a kh?i ??ng th?" + +#: src/err-codes.h:152 +msgid "Unsupported operation" +msgstr "Thao t?c kh?ng ???c h? tr?" + +#: src/err-codes.h:153 +msgid "Wrong key usage" +msgstr "Sai d?ng kh?a" + +#: src/err-codes.h:154 +msgid "Nothing found" +msgstr "Kh?ng t?m th?y" + +#: src/err-codes.h:155 +msgid "Wrong blob type" +msgstr "Sai ki?u blob" + +#: src/err-codes.h:156 +msgid "Missing value" +msgstr "Thi?u gi? tr?" + +#: src/err-codes.h:157 +msgid "Hardware problem" +msgstr "L?i ph?n c?ng" + +#: src/err-codes.h:158 +msgid "PIN blocked" +msgstr "PIN b? ch?n" + +#: src/err-codes.h:159 +msgid "Conditions of use not satisfied" +msgstr "Ch?a th?a m?n c?c ?i?u ki?n d?ng" + +#: src/err-codes.h:160 +msgid "PINs are not synced" +msgstr "C?c PIN ch?a ??ng b?" + +#: src/err-codes.h:161 +msgid "Invalid CRL" +msgstr "CRL kh?ng h?p l?" + +#: src/err-codes.h:162 +msgid "BER error" +msgstr "L?i BER" + +#: src/err-codes.h:163 +msgid "Invalid BER" +msgstr "URI kh?ng h?p l?" + +#: src/err-codes.h:164 +msgid "Element not found" +msgstr "Kh?ng t?m th?y y?u t?" + +#: src/err-codes.h:165 +msgid "Identifier not found" +msgstr "Kh?ng t?m th?y ?i?u nh?n di?n" + +#: src/err-codes.h:166 +msgid "Invalid tag" +msgstr "Th? (tag) kh?ng h?p l?" + +#: src/err-codes.h:167 +msgid "Invalid length" +msgstr "?? d?i kh?ng h?p l?" + +#: src/err-codes.h:168 +msgid "Invalid key info" +msgstr "Th?ng tin kh?a kh?ng h?p l?" + +#: src/err-codes.h:169 +msgid "Unexpected tag" +msgstr "Th? (tag) b?t ng?" + +#: src/err-codes.h:170 +msgid "Not DER encoded" +msgstr "Ch?a m? h?a DER" + +#: src/err-codes.h:171 +msgid "No CMS object" +msgstr "Kh?ng c? ??i t??ng CMS" + +#: src/err-codes.h:172 +msgid "Invalid CMS object" +msgstr "??i t??ng CMS kh?ng h?p l?" + +#: src/err-codes.h:173 +msgid "Unknown CMS object" +msgstr "??i t??ng CMS l?" + +#: src/err-codes.h:174 +msgid "Unsupported CMS object" +msgstr "??i t??ng CMS kh?ng ???c h? tr?" + +#: src/err-codes.h:175 +msgid "Unsupported encoding" +msgstr "C?ch m? h?a kh?ng ???c h? tr?" + +#: src/err-codes.h:176 +msgid "Unsupported CMS version" +msgstr "Phi?n b?n CMS kh?ng ???c h? tr?" + +#: src/err-codes.h:177 +msgid "Unknown algorithm" +msgstr "Thu?t to?n l?" + +#: src/err-codes.h:178 +msgid "Invalid crypto engine" +msgstr "??ng c? m?t m? h?c kh?ng h?p l?" + +#: src/err-codes.h:179 +msgid "Public key not trusted" +msgstr "Kh?a c?ng kh?ng tin c?y" + +#: src/err-codes.h:180 +msgid "Decryption failed" +msgstr "Vi?c gi?i m?t m? b? l?i" + +#: src/err-codes.h:181 +msgid "Key expired" +msgstr "Kh?a h?t h?n" + +#: src/err-codes.h:182 +msgid "Signature expired" +msgstr "Ch? k? h?t h?n" + +#: src/err-codes.h:183 +msgid "Encoding problem" +msgstr "L?i m? h?a" + +#: src/err-codes.h:184 +msgid "Invalid state" +msgstr "T?nh tr?ng kh?ng h?p l?" + +#: src/err-codes.h:185 +msgid "Duplicated value" +msgstr "Gi? tr? tr?ng" + +#: src/err-codes.h:186 +msgid "Missing action" +msgstr "Thi?u h?nh ??ng" + +#: src/err-codes.h:187 +msgid "ASN.1 module not found" +msgstr "Kh?ng t?m th?y m?-?un ASN.1" + +#: src/err-codes.h:188 +msgid "Invalid OID string" +msgstr "Chu?i OID kh?ng h?p l?" + +#: src/err-codes.h:189 +msgid "Invalid time" +msgstr "Th?i gian kh?ng h?p l?" + +#: src/err-codes.h:190 +msgid "Invalid CRL object" +msgstr "??i t??ng CRL kh?ng h?p l?" + +#: src/err-codes.h:191 +msgid "Unsupported CRL version" +msgstr "Phi?n b?n CRL kh?ng ???c h? tr?" + +#: src/err-codes.h:192 +msgid "Invalid certificate object" +msgstr "??i t??ng ch?ng nh?n kh?ng h?p l?" + +#: src/err-codes.h:193 +msgid "Unknown name" +msgstr "T?n l?" + +#: src/err-codes.h:194 +msgid "A locale function failed" +msgstr "M?t h?m mi?n ??a ph??ng b? l?i" + +#: src/err-codes.h:195 +msgid "Not locked" +msgstr "Ch?a kh?a" + +#: src/err-codes.h:196 +msgid "Protocol violation" +msgstr "Vi ph?m giao th?c" + +#: src/err-codes.h:197 +msgid "Invalid MAC" +msgstr "MAC kh?ng h?p l?" + +#: src/err-codes.h:198 +msgid "Invalid request" +msgstr "Y?u c?u kh?ng h?p l?" + +#: src/err-codes.h:199 +msgid "Buffer too short" +msgstr "V?ng ??m qu? ng?n" + +#: src/err-codes.h:200 +msgid "Invalid length specifier in S-expression" +msgstr "?i?u ghi r? ?? d?i kh?ng h?p l? trong bi?u th?c S" + +#: src/err-codes.h:201 +msgid "String too long in S-expression" +msgstr "Chu?i qu? d?i trong bi?u th?c S" + +#: src/err-codes.h:202 +msgid "Unmatched parentheses in S-expression" +msgstr "C? ngo?c ch?a kh?p trong bi?u th?c S" + +#: src/err-codes.h:203 +msgid "S-expression not canonical" +msgstr "Bi?u th?c S kh?ng ph?i chu?n t?c" + +#: src/err-codes.h:204 +msgid "Bad character in S-expression" +msgstr "K? t? sai trong bi?u th?c S" + +#: src/err-codes.h:205 +msgid "Bad quotation in S-expression" +msgstr "?o?n tr?ch d?n sai trong bi?u th?c S" + +#: src/err-codes.h:206 +msgid "Zero prefix in S-expression" +msgstr "Ti?n t? s? kh?ng trong bi?u th?c S" + +#: src/err-codes.h:207 +msgid "Nested display hints in S-expression" +msgstr "C? m?o hi?n th? l?ng nhau trong bi?u th?c S" + +#: src/err-codes.h:208 +msgid "Unmatched display hints" +msgstr "C? m?o hi?n th? ch?a kh?p" + +#: src/err-codes.h:209 +msgid "Unexpected reserved punctuation in S-expression" +msgstr "C? d?u ch?m c?u ?? d?nh ri?ng b?t ng? trong bi?u th?c S" + +#: src/err-codes.h:210 +msgid "Bad hexadecimal character in S-expression" +msgstr "K? t? th?p l?c sai trong bi?u th?c S" + +#: src/err-codes.h:211 +msgid "Odd hexadecimal numbers in S-expression" +msgstr "C? s? th?p l?c l? trong bi?u th?c S" + +#: src/err-codes.h:212 +msgid "Bad octadecimal character in S-expression" +msgstr "K? t? b?t ph?n trong bi?u th?c S" + +#: src/err-codes.h:213 +msgid "User defined error code 1" +msgstr "M? l?i t? ??nh ngh?a 1" + +#: src/err-codes.h:214 +msgid "User defined error code 2" +msgstr "M? l?i t? ??nh ngh?a 2" + +#: src/err-codes.h:215 +msgid "User defined error code 3" +msgstr "M? l?i t? ??nh ngh?a 3" + +#: src/err-codes.h:216 +msgid "User defined error code 4" +msgstr "M? l?i t? ??nh ngh?a 4" + +#: src/err-codes.h:217 +msgid "User defined error code 5" +msgstr "M? l?i t? ??nh ngh?a 5" + +#: src/err-codes.h:218 +msgid "User defined error code 6" +msgstr "M? l?i t? ??nh ngh?a 6" + +#: src/err-codes.h:219 +msgid "User defined error code 7" +msgstr "M? l?i t? ??nh ngh?a 7" + +#: src/err-codes.h:220 +msgid "User defined error code 8" +msgstr "M? l?i t? ??nh ngh?a 8" + +#: src/err-codes.h:221 +msgid "User defined error code 9" +msgstr "M? l?i t? ??nh ngh?a 9" + +#: src/err-codes.h:222 +msgid "User defined error code 10" +msgstr "M? l?i t? ??nh ngh?a 10" + +#: src/err-codes.h:223 +msgid "User defined error code 11" +msgstr "M? l?i t? ??nh ngh?a 11" + +#: src/err-codes.h:224 +msgid "User defined error code 12" +msgstr "M? l?i t? ??nh ngh?a 12" + +#: src/err-codes.h:225 +msgid "User defined error code 13" +msgstr "M? l?i t? ??nh ngh?a 13" + +#: src/err-codes.h:226 +msgid "User defined error code 14" +msgstr "M? l?i t? ??nh ngh?a 14" + +#: src/err-codes.h:227 +msgid "User defined error code 15" +msgstr "M? l?i t? ??nh ngh?a 15" + +#: src/err-codes.h:228 +msgid "User defined error code 16" +msgstr "M? l?i t? ??nh ngh?a 16" + +#: src/err-codes.h:229 +msgid "Unknown system error" +msgstr "G?p l?i h? th?ng l?" + +#: src/err-codes.h:230 +msgid "End of file" +msgstr "K?t th?c t?p tin" + +#: src/err-codes.h:231 +msgid "Unknown error code" +msgstr "M? l?i l?" + +#: src/gpg-error.c:281 +#, c-format +msgid "Usage: %s GPG-ERROR [...]\n" +msgstr "C?ch s? d?ng: %s GPG-ERROR [...]\n" + +#: src/gpg-error.c:302 +#, c-format +msgid "%s: warning: could not recognize %s\n" +msgstr "%s: c?nh b?o : kh?ng th? nh?n ra %s\n" From cvs at cvs.gnupg.org Tue Jan 24 22:03:08 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Tue Jan 24 21:23:18 2006 Subject: [svn] GnuPG - r3992 - trunk/g10 Message-ID: Author: dshaw Date: 2006-01-24 22:03:06 +0100 (Tue, 24 Jan 2006) New Revision: 3992 Modified: trunk/g10/ChangeLog trunk/g10/keyserver.c Log: * keyserver.c (parse_keyserver_uri): If there is a path present, set the direct_uri flag so the right keyserver helper is run. Modified: trunk/g10/ChangeLog =================================================================== --- trunk/g10/ChangeLog 2006-01-22 21:40:20 UTC (rev 3991) +++ trunk/g10/ChangeLog 2006-01-24 21:03:06 UTC (rev 3992) @@ -1,3 +1,8 @@ +2006-01-24 David Shaw + + * keyserver.c (parse_keyserver_uri): If there is a path present, + set the direct_uri flag so the right keyserver helper is run. + 2006-01-22 David Shaw * keyserver.c (keyserver_spawn): Include the EXEEXT so we can find Modified: trunk/g10/keyserver.c =================================================================== --- trunk/g10/keyserver.c 2006-01-22 21:40:20 UTC (rev 3991) +++ trunk/g10/keyserver.c 2006-01-24 21:03:06 UTC (rev 3992) @@ -362,6 +362,9 @@ keyserver->path=xstrdup(uri); else keyserver->path=xstrdup("/"); + + if(keyserver->path[1]!='\0') + keyserver->flags.direct_uri=1; } else if(uri[0]!='/') { From cvs at cvs.gnupg.org Thu Jan 26 11:23:17 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Thu Jan 26 10:43:26 2006 Subject: [svn] gpgme - r1151 - trunk/gpgme Message-ID: Author: wk Date: 2006-01-26 11:23:15 +0100 (Thu, 26 Jan 2006) New Revision: 1151 Modified: trunk/gpgme/ChangeLog trunk/gpgme/gpgme.h trunk/gpgme/posix-util.c trunk/gpgme/util.h trunk/gpgme/w32-io.c trunk/gpgme/w32-util.c Log: [W32] Add a tuning feature Modified: trunk/gpgme/ChangeLog =================================================================== --- trunk/gpgme/ChangeLog 2006-01-05 08:58:50 UTC (rev 1150) +++ trunk/gpgme/ChangeLog 2006-01-26 10:23:15 UTC (rev 1151) @@ -1,3 +1,10 @@ +2006-01-26 Werner Koch + + * w32-util.c (_gpgme_get_conf_int): New. + * posix-util.c (_gpgme_get_conf_int): New. + * w32-io.c (get_desired_thread_priority): New. + (create_reader, create_writer): Use it here. + 2006-01-04 Werner Koch * debug.h (_gpgme_debug_srcname): New. Use it with the debug macros. Modified: trunk/gpgme/gpgme.h =================================================================== --- trunk/gpgme/gpgme.h 2006-01-05 08:58:50 UTC (rev 1150) +++ trunk/gpgme/gpgme.h 2006-01-26 10:23:15 UTC (rev 1151) @@ -72,7 +72,7 @@ AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "1.1.1-cvs1149" +#define GPGME_VERSION "1.1.1-cvs1150" Modified: trunk/gpgme/posix-util.c =================================================================== --- trunk/gpgme/posix-util.c 2006-01-05 08:58:50 UTC (rev 1150) +++ trunk/gpgme/posix-util.c 2006-01-26 10:23:15 UTC (rev 1151) @@ -48,3 +48,10 @@ return NULL; #endif } + +/* See w32-util.c */ +int +_gpgme_get_conf_int (const char *key, int *value) +{ + return 0; +} Modified: trunk/gpgme/util.h =================================================================== --- trunk/gpgme/util.h 2006-01-05 08:58:50 UTC (rev 1150) +++ trunk/gpgme/util.h 2006-01-26 10:23:15 UTC (rev 1151) @@ -31,6 +31,7 @@ /*-- {posix,w32}-util.c --*/ const char *_gpgme_get_gpg_path (void); const char *_gpgme_get_gpgsm_path (void); +int _gpgme_get_conf_int (const char *key, int *value); /*-- replacement functions in .c --*/ Modified: trunk/gpgme/w32-io.c =================================================================== --- trunk/gpgme/w32-io.c 2006-01-05 08:58:50 UTC (rev 1150) +++ trunk/gpgme/w32-io.c 2006-01-26 10:23:15 UTC (rev 1151) @@ -119,6 +119,23 @@ +static int +get_desired_thread_priority (void) +{ + int value; + + if (!_gpgme_get_conf_int ("IOThreadPriority", &value)) + { + value = THREAD_PRIORITY_HIGHEST; + DEBUG1 ("** Using standard IOThreadPriority of %d\n", value); + } + else + DEBUG1 ("** Configured IOThreadPriority is %d\n", value); + + return value; +} + + static HANDLE set_synchronize (HANDLE h) { @@ -266,7 +283,7 @@ /* We set the priority of the thread higher because we know that it only runs for a short time. This greatly helps to increase the performance of the I/O. */ - SetThreadPriority (c->thread_hd, THREAD_PRIORITY_HIGHEST); + SetThreadPriority (c->thread_hd, get_desired_thread_priority ()); } return c; @@ -524,7 +541,7 @@ /* We set the priority of the thread higher because we know that it only runs for a short time. This greatly helps to increase the performance of the I/O. */ - SetThreadPriority (c->thread_hd, THREAD_PRIORITY_HIGHEST); + SetThreadPriority (c->thread_hd, get_desired_thread_priority ()); } return c; Modified: trunk/gpgme/w32-util.c =================================================================== --- trunk/gpgme/w32-util.c 2006-01-05 08:58:50 UTC (rev 1150) +++ trunk/gpgme/w32-util.c 2006-01-26 10:23:15 UTC (rev 1151) @@ -265,7 +265,6 @@ return result; } - const char * _gpgme_get_gpg_path (void) { @@ -301,3 +300,18 @@ UNLOCK (get_path_lock); return gpgsm_program; } + + +/* Return an integer value from gpgme specific configuration + entries. VALUE receives that value; function returns true if a value + has been configured and false if not. */ +int +_gpgme_get_conf_int (const char *key, int *value) +{ + char *tmp = read_w32_registry_string (NULL, "Software\\GNU\\gpgme", key); + if (!tmp) + return 0; + *value = atoi (tmp); + free (tmp); + return 1; +} From cvs at cvs.gnupg.org Thu Jan 26 11:56:56 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Thu Jan 26 11:17:01 2006 Subject: [svn] gpgme - r1152 - trunk Message-ID: Author: wk Date: 2006-01-26 11:56:56 +0100 (Thu, 26 Jan 2006) New Revision: 1152 Modified: trunk/configure.ac Log: From cvs at cvs.gnupg.org Thu Jan 26 12:08:17 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Thu Jan 26 11:28:17 2006 Subject: [svn] GPGol - r137 - trunk Message-ID: Author: wk Date: 2006-01-26 12:08:16 +0100 (Thu, 26 Jan 2006) New Revision: 137 Modified: trunk/ChangeLog trunk/NEWS trunk/configure.ac Log: Preparing a new releases Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-01-16 12:01:18 UTC (rev 136) +++ trunk/ChangeLog 2006-01-26 11:08:16 UTC (rev 137) @@ -1,3 +1,7 @@ +2006-01-26 Werner Koch + + Released 0.9.6. + 2005-12-07 Werner Koch Released 0.9.5. Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2006-01-16 12:01:18 UTC (rev 136) +++ trunk/NEWS 2006-01-26 11:08:16 UTC (rev 137) @@ -1,7 +1,9 @@ -Noteworthy changes for version 0.9.6 +Noteworthy changes for version 0.9.6 (2006-01-26) ================================================= +* Cosmetic fixes. + Noteworthy changes for version 0.9.5 (2005-12-07) ================================================= Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2006-01-16 12:01:18 UTC (rev 136) +++ trunk/configure.ac 2006-01-26 11:08:16 UTC (rev 137) @@ -16,7 +16,7 @@ # Version number: Remember to change it immediately *after* a release. # Make sure to run "svn up" before a "make dist". # Add a "-cvs" prefix for non-released code. -AC_INIT(gpgol, 0.9.6-cvs, bug-gpgol@g10code.com) +AC_INIT(gpgol, 0.9.6, bug-gpgol@g10code.com) NEED_GPGME_API=1 NEED_GPGME_VERSION=1.1.0 From cvs at cvs.gnupg.org Thu Jan 26 12:15:12 2006 From: cvs at cvs.gnupg.org (svn author wk) Date: Thu Jan 26 11:35:11 2006 Subject: [svn] GPGol - r138 - tags Message-ID: Author: wk Date: 2006-01-26 12:15:11 +0100 (Thu, 26 Jan 2006) New Revision: 138 Added: tags/gpgol-0.9.6/ Log: From cvs at cvs.gnupg.org Thu Jan 26 17:51:06 2006 From: cvs at cvs.gnupg.org (svn author dshaw) Date: Thu Jan 26 17:11:09 2006 Subject: [svn] GnuPG - r3993 - trunk/util Message-ID: Author: dshaw Date: 2006-01-26 17:51:04 +0100 (Thu, 26 Jan 2006) New Revision: 3993 Modified: trunk/util/ChangeLog trunk/util/cert.c trunk/util/srv.c Log: * cert.c (get_cert): Disable IPGP types for now until the format questions in the draft are settled. * srv.c (getsrv): Error on oversize SRV responses. Modified: trunk/util/ChangeLog =================================================================== --- trunk/util/ChangeLog 2006-01-24 21:03:06 UTC (rev 3992) +++ trunk/util/ChangeLog 2006-01-26 16:51:04 UTC (rev 3993) @@ -1,3 +1,10 @@ +2006-01-26 David Shaw + + * cert.c (get_cert): Disable IPGP types for now until the format + questions in the draft are settled. + + * srv.c (getsrv): Error on oversize SRV responses. + 2005-12-24 David Shaw * cert.c (get_cert): Properly chase down CNAMEs pointing to CERTs. Modified: trunk/util/cert.c =================================================================== --- trunk/util/cert.c 2006-01-24 21:03:06 UTC (rev 3992) +++ trunk/util/cert.c 2006-01-26 16:51:04 UTC (rev 3993) @@ -134,6 +134,7 @@ ret=1; break; } +#if 0 else if(ctype==6 && dlen<1023 && url) { /* Sanity check the IPGP URL type that the URL isn't too @@ -145,6 +146,7 @@ ret=2; break; } +#endif /* Neither type matches, so go around to the next answer. */ pt+=dlen; Modified: trunk/util/srv.c =================================================================== --- trunk/util/srv.c 2006-01-24 21:03:06 UTC (rev 3992) +++ trunk/util/srv.c 2006-01-26 16:51:04 UTC (rev 3993) @@ -42,7 +42,8 @@ #define T_SRV 33 #endif -static int priosort(const void *a,const void *b) +static int +priosort(const void *a,const void *b) { const struct srventry *sa=a,*sb=b; if(sa->priority>sb->priority) @@ -64,7 +65,7 @@ *list=NULL; r=res_query(name,C_IN,T_SRV,answer,PACKETSZ); - if(rPACKETSZ) return -1; if((((HEADER *)answer)->rcode)==NOERROR &&