From 2e8481c03bceef8d009ea30b40c3e1674cfc9e93 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 10 Oct 2006 11:11:04 +0000 Subject: [PATCH] Various changes --- ChangeLog | 8 +++ TODO | 7 ++- acinclude.m4 | 64 --------------------- agent/ChangeLog | 3 + agent/Makefile.am | 6 +- common/ChangeLog | 11 ++++ common/Makefile.am | 2 +- common/gpgrlhelp.c | 6 +- common/util.h | 7 +++ configure.ac | 50 ++++++---------- doc/gpg-agent.texi | 30 +++++----- doc/instguide.texi | 6 +- doc/sysnotes.texi | 3 + g10/ChangeLog | 14 +++++ g10/Makefile.am | 2 +- g10/gpgv.c | 16 ------ g10/keyedit.c | 2 + m4/ChangeLog | 9 +++ m4/Makefile.am | 2 + m4/gnupg-pth.m4 | 114 ++++++++++++++++++++++++++++++++++++ m4/libassuan.m4 | 140 ++++++++++++++++++++++++++++++++++++--------- po/be.po | 12 ++-- po/ca.po | 12 ++-- po/cs.po | 12 ++-- po/da.po | 12 ++-- po/de.po | 12 ++-- po/el.po | 12 ++-- po/eo.po | 12 ++-- po/es.po | 12 ++-- po/et.po | 12 ++-- po/fi.po | 12 ++-- po/fr.po | 12 ++-- po/gl.po | 12 ++-- po/hu.po | 12 ++-- po/id.po | 12 ++-- po/it.po | 12 ++-- po/ja.po | 12 ++-- po/nb.po | 12 ++-- po/pl.po | 12 ++-- po/pt.po | 12 ++-- po/pt_BR.po | 12 ++-- po/ro.po | 12 ++-- po/ru.po | 12 ++-- po/sk.po | 12 ++-- po/sv.po | 12 ++-- po/tr.po | 12 ++-- po/zh_CN.po | 12 ++-- po/zh_TW.po | 12 ++-- scd/ChangeLog | 7 +++ scd/Makefile.am | 6 +- scd/app-p15.c | 2 +- scd/scdaemon.h | 3 +- sm/ChangeLog | 5 ++ sm/Makefile.am | 6 +- tools/ChangeLog | 5 ++ tools/Makefile.am | 4 +- 56 files changed, 527 insertions(+), 337 deletions(-) create mode 100644 m4/gnupg-pth.m4 diff --git a/ChangeLog b/ChangeLog index 4617ec59a..bce753879 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-10-09 Werner Koch + + * acinclude.m4: Moved pth check to m4/gnupg-pth.m4. + +2006-10-06 Werner Koch + + * configure.ac: Also check for libassuan's pth version. + 2006-10-04 Werner Koch Released 1.9.91. diff --git a/TODO b/TODO index c43aabe55..c3b4b5b1f 100644 --- a/TODO +++ b/TODO @@ -68,6 +68,10 @@ might want to have an agent context for each service request Needs to be integrated with the status file update, though. It is not a real problem because application will get a card removed status and should the send a reset to try solving the problem. +** app-p15.c:do_auth + We assume SHA1 here. However we should also allow for TLS-MD5SHA1. + To properly inplement this we need to extend the inetrnal API. A + simple workaround by looking at the digest size if possible. ** Add a test to check the extkeyusage. @@ -99,7 +103,8 @@ might want to have an agent context for each service request ** g10/ Replace DIGEST_ALGO_SHA224 We can't do that right now because it is only defined by newer versions of libgcrypt. - +** GCRY_MD_USER + Remove these definitions. * Extend selinux support to other modules diff --git a/acinclude.m4 b/acinclude.m4 index aa2199de0..fd5245927 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -186,70 +186,6 @@ AC_DEFUN([GNUPG_BUILD_PROGRAM], -# GNUPG_PTH_VERSION_CHECK(REQUIRED) -# -# If the version is sufficient, HAVE_PTH will be set to yes. -# -# Taken form the m4 macros which come with Pth -AC_DEFUN([GNUPG_PTH_VERSION_CHECK], - [ - _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'` - _req_version="ifelse([$1],,1.2.0,$1)" - - AC_MSG_CHECKING(for PTH - version >= $_req_version) - for _var in _pth_version _req_version; do - eval "_val=\"\$${_var}\"" - _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'` - _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'` - _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'` - _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'` - case $_rtype in - "a" ) _rtype=0 ;; - "b" ) _rtype=1 ;; - "." ) _rtype=2 ;; - esac - _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \ - "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"` - eval "${_var}_hex=\"\$_hex\"" - done - have_pth=no - if test ".$_pth_version_hex" != .; then - if test ".$_req_version_hex" != .; then - if test $_pth_version_hex -ge $_req_version_hex; then - have_pth=yes - fi - fi - fi - if test $have_pth = yes; then - AC_MSG_RESULT(yes) - AC_MSG_CHECKING([whether PTH installation is sane]) - AC_CACHE_VAL(gnupg_cv_pth_is_sane,[ - _gnupg_pth_save_cflags=$CFLAGS - _gnupg_pth_save_ldflags=$LDFLAGS - _gnupg_pth_save_libs=$LIBS - CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`" - LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`" - LIBS="$LIBS `$PTH_CONFIG --libs`" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include - ], - [[ pth_init ();]])], - gnupg_cv_pth_is_sane=yes, - gnupg_cv_pth_is_sane=no) - CFLAGS=$_gnupg_pth_save_cflags - LDFLAGS=$_gnupg_pth_save_ldflags - LIBS=$_gnupg_pth_save_libs - ]) - if test $gnupg_cv_pth_is_sane != yes; then - have_pth=no - fi - AC_MSG_RESULT($gnupg_cv_pth_is_sane) - else - AC_MSG_RESULT(no) - fi - ]) - - - # Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock # is not called from uid 0 (not tested whether uid 0 works) diff --git a/agent/ChangeLog b/agent/ChangeLog index 3b5999c1a..e255674fd 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,5 +1,8 @@ 2006-10-06 Werner Koch + * Makefile.am (AM_CFLAGS): Use PTH version of libassuan. + (gpg_agent_LDADD): Ditto. + * divert-scd.c (divert_pksign): Use PKAUTH for the TLS algo. 2006-10-05 Werner Koch diff --git a/agent/Makefile.am b/agent/Makefile.am index 794d47ed3..27cde6524 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -27,8 +27,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl include $(top_srcdir)/am/cmacros.am -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) \ - $(PTH_CFLAGS) +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(GPG_ERROR_CFLAGS) \ + $(PTH_CFLAGS) gpg_agent_SOURCES = \ gpg-agent.c agent.h \ @@ -51,7 +51,7 @@ common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a pwquery_libs = ../common/libsimple-pwquery.a gpg_agent_LDADD = $(common_libs) \ - $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \ + $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) gpg_protect_tool_SOURCES = \ diff --git a/common/ChangeLog b/common/ChangeLog index 12d42ae82..f5cae13e8 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,14 @@ +2006-10-08 Werner Koch + + * gpgrlhelp.c: Trun all functions into dummies if readline is not + available. + +2006-10-06 Werner Koch + + * Makefile.am (AM_CFLAGS): Use PTH version of libassuan. + + * util.h (GNUPG_GCC_A_SENTINEL): Defined for gcc >= 4. + 2006-10-04 David Shaw * gpgrlhelp.c: readline requires stdio.h. diff --git a/common/Makefile.am b/common/Makefile.am index 52b56e94c..64c7f10d1 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -26,7 +26,7 @@ TESTS = $(module_tests) AM_CPPFLAGS = -I$(top_srcdir)/gl -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) \ +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \ $(PTH_CFLAGS) libcommon_a_SOURCES = \ diff --git a/common/gpgrlhelp.c b/common/gpgrlhelp.c index 56a9ce28c..ec72c98c8 100644 --- a/common/gpgrlhelp.c +++ b/common/gpgrlhelp.c @@ -40,6 +40,7 @@ #include "common-defs.h" +#ifdef HAVE_LIBREADLINE static void set_completer (rl_completion_func_t *completer) { @@ -68,12 +69,15 @@ init_stream (FILE *fp) rl_inhibit_completion = 1; } +#endif /*HAVE_LIBREADLINE*/ + /* Initialize our readline code. This should be called as early as possible as it is actually a constructur. */ void gnupg_rl_initialize (void) { +#ifdef HAVE_LIBREADLINE tty_private_set_rl_hooks (init_stream, set_completer, inhibit_completion, @@ -81,7 +85,7 @@ gnupg_rl_initialize (void) readline, add_history); rl_readline_name = "GnuPG"; - +#endif } diff --git a/common/util.h b/common/util.h index 8940c9355..7a9738d69 100644 --- a/common/util.h +++ b/common/util.h @@ -43,6 +43,13 @@ #include "../jnlib/dotlock.h" #include "../jnlib/utf8conv.h" +#if __GNUC__ >= 4 +# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a))) +#else +# define GNUPG_GCC_A_SENTINEL(a) +#endif + + /* We need this type even if we are not using libreadline and or we did not include libreadline in the current file. */ #ifndef GNUPG_LIBREADLINE_H_INCLUDED diff --git a/configure.ac b/configure.ac index 00aa140f4..c66c30a94 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,7 @@ NEED_LIBGCRYPT_API=1 NEED_LIBGCRYPT_VERSION=1.1.94 NEED_LIBASSUAN_VERSION=0.9.1 +NEED_LIBASSUAN_API=1 NEED_KSBA_API=1 NEED_KSBA_VERSION=1.0.0 @@ -578,8 +579,13 @@ AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", # # libassuan is used for IPC # -AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_VERSION", +AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", have_libassuan=yes,have_libassuan=no) +if test "$have_libassuan" = "yes"; then + have_libassuan=no + AM_PATH_LIBASSUAN_PTH("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION", + have_libassuan=yes,have_libassuan=no) +fi # @@ -632,17 +638,12 @@ AC_DEFINE_UNQUOTED(SHRED, # Check whether the GNU Pth library is available # Note, that we include a Pth emulation for W32. # -AC_ARG_WITH(pth-prefix, - AC_HELP_STRING([--with-pth-prefix=PFX], - [prefix where GNU Pth is installed (optional)]), - pth_config_prefix="$withval", pth_config_prefix="") -if test x$pth_config_prefix != x ; then - PTH_CONFIG="$pth_config_prefix/bin/pth-config" -fi -AC_PATH_PROG(PTH_CONFIG, pth-config, no) -if test "$have_w32_system" = no; then - if test "$PTH_CONFIG" = "no"; then - AC_MSG_WARN([[ +GNUPG_PATH_PTH +if test "$have_pth" = "yes"; then + AC_DEFINE(USE_GNU_PTH, 1, + [Defined if the GNU Portable Thread Library should be used]) +else + AC_MSG_WARN([[ *** *** To support concurrent access to the gpg-agent and the SCdaemon *** we need the support of the GNU Portable Threads Library. @@ -650,27 +651,8 @@ if test "$have_w32_system" = no; then *** On a Debian GNU/Linux system you might want to try *** apt-get install libpth-dev ***]]) - else - GNUPG_PTH_VERSION_CHECK(1.3.7) - if test $have_pth = yes; then - PTH_CFLAGS=`$PTH_CONFIG --cflags` - PTH_LIBS=`$PTH_CONFIG --ldflags` - PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`" - AC_DEFINE(USE_GNU_PTH, 1, - [Defined if the GNU Portable Thread Library should be used]) - AC_DEFINE(HAVE_PTH, 1, - [Defined if the GNU Pth is available]) - fi - fi -else - have_pth=yes - PTH_CFLAGS="" - PTH_LIBS="" - AC_DEFINE(USE_GNU_PTH, 1) - AC_DEFINE(HAVE_PTH, 1) fi -AC_SUBST(PTH_CFLAGS) -AC_SUBST(PTH_LIBS) + # @@ -1262,10 +1244,10 @@ if test "$have_libassuan" = "no"; then die=yes AC_MSG_NOTICE([[ *** -*** You need libassuan to build this program. +*** You need libassuan with Pth support to build this program. *** This library is for example available at *** ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/ -*** (at least version $NEED_LIBASSUAN_VERSION is required). +*** (at least version $NEED_LIBASSUAN_VERSION (API $NEED_LIBASSUAN_API) is required). ***]]) fi if test "$have_ksba" = "no"; then diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index 0912ea681..44440bbcf 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -740,13 +740,23 @@ test whether the key is a valid key to sign something and responds with okay. @example - SETHASH + SETHASH --hash=| @end example The client can use this command to tell the server about the data (which usually is a hash) to be signed. is the decimal encoded hash -algorithm number as used by Libgcrypt. +algorithm number as used by Libgcrypt. Either or --hash= +must be given. Valid names for are: +@table @code +@item sha1 +@item sha256 +@item rmd160 +@item md5 +@item tls-md5sha1 +@end table + +@noindent The actual signing is done using @example @@ -754,19 +764,9 @@ The actual signing is done using @end example Options are not yet defined, but my later be used to choosen among -different algorithms (e.g. pkcs 1.5) - -The agent does then some checks, asks for the passphrase and -if SETHASH has not been used asks the client for the data to sign: - -@example - S: INQUIRE HASHVAL - C: D ABCDEF012345678901234 - C: END -@end example - -As a result the server returns the signature as an SPKI like S-Exp -in "D" lines: +different algorithms. The agent does then some checks, asks for the +passphrase and as a result the server returns the signature as an SPKI +like S-expression in "D" lines: @example (sig-val diff --git a/doc/instguide.texi b/doc/instguide.texi index 1a65afbcb..aecff7314 100644 --- a/doc/instguide.texi +++ b/doc/instguide.texi @@ -13,7 +13,11 @@ to GnuPG etc. ** Explain how to setup a root CA key as trusted ** Explain how trustlist.txt might be managed. - +** How to get the ssh support running + How to use the ssh support. + + +@section Installation Overview diff --git a/doc/sysnotes.texi b/doc/sysnotes.texi index 6ca10c195..d36c81b2f 100644 --- a/doc/sysnotes.texi +++ b/doc/sysnotes.texi @@ -66,6 +66,9 @@ any security audit and you should not use any valuable private key. In particular, @strong{using it on a box with more than one user, might lead to a key compromise}. +@strong{It is quite possible that the current version does not even +build.} + @noindent Current limitations are: diff --git a/g10/ChangeLog b/g10/ChangeLog index 6ad1da667..e5b900607 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,17 @@ +2006-10-08 Werner Koch + + * gpgv.c: Remove the tty stubs as we are now required to link to + tty anyway (it is included in libcommand and has dependencies to + other modules as well). + + * keyedit.c (keyedit_menu): Use keyedit_completion only if + readline is available. It would be better to move this code into + gpgrlhelp.c + +2006-10-06 Werner Koch + + * Makefile.am (AM_CFLAGS): Use PTH version of libassuan. + 2006-10-06 David Shaw * keyserver.c (keyserver_spawn): Write the 16-digit keyid rather diff --git a/g10/Makefile.am b/g10/Makefile.am index 580ac7605..d7a5ac1f6 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -27,7 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ include $(top_srcdir)/am/cmacros.am -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(GPG_ERROR_CFLAGS) needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a diff --git a/g10/gpgv.c b/g10/gpgv.c index 0333d084b..b4730f459 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -388,22 +388,6 @@ void cipher_decrypt( gcry_cipher_hd_t c, byte *outbuf, void cipher_sync( gcry_cipher_hd_t c ) {} -/* Stubs to avoid linking to ../util/ttyio.c */ -int tty_batchmode( int onoff ) { return 0; } -void tty_printf( const char *fmt, ... ) { } -void tty_fprintf (FILE *fp, const char *fmt, ... ) { } -void tty_print_string( const byte *p, size_t n ) { } -void tty_print_utf8_string( const byte *p, size_t n ) {} -void tty_print_utf8_string2( const byte *p, size_t n, size_t max_n ) {} -char *tty_get( const char *prompt ) { return NULL;} -char *tty_get_hidden( const char *prompt ) {return NULL; } -void tty_kill_prompt(void) {} -int tty_get_answer_is_yes( const char *prompt ) {return 0;} -int tty_no_terminal(int onoff) {return 0;} -#ifdef HAVE_LIBREADLINE -void tty_enable_completion(rl_completion_func_t *completer) {} -void tty_disable_completion(void) {} -#endif /* We do not do any locking, so use these stubs here */ void disable_dotlock(void) {} diff --git a/g10/keyedit.c b/g10/keyedit.c index 71ad9f083..d01bbbc59 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1620,7 +1620,9 @@ keyedit_menu( const char *username, strlist_t locusr, } if( !have_commands ) { +#ifdef HAVE_LIBREADLINE tty_enable_completion(keyedit_completion); +#endif answer = cpr_get_no_help("keyedit.prompt", _("Command> ")); cpr_kill_prompt(); tty_disable_completion(); diff --git a/m4/ChangeLog b/m4/ChangeLog index f666fa38d..c556d40d1 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,12 @@ +2006-10-09 Werner Koch + + * gnupg-pth.m4: New. Taken from ../acinclude.m4. + (GNUPG_PATH_PTH): New. + +2006-10-06 Werner Koch + + * libassuan.m4: Updated. + 2006-07-27 Werner Koch * autobuild.m4: New. diff --git a/m4/Makefile.am b/m4/Makefile.am index 14d93b19a..339e92fb1 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -2,6 +2,8 @@ EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_ EXTRA_DIST += ldap.m4 libcurl.m4 libusb.m4 tar-ustar.m4 readline.m4 +EXTRA_DIST += gnupg-pth.m4 + EXTRA_DIST += gpg-error.m4 libgcrypt.m4 libassuan.m4 ksba.m4 EXTRA_DIST += autobuild.m4 diff --git a/m4/gnupg-pth.m4 b/m4/gnupg-pth.m4 new file mode 100644 index 000000000..00db177e9 --- /dev/null +++ b/m4/gnupg-pth.m4 @@ -0,0 +1,114 @@ +dnl GnuPG's check for Pth. +dnl Copyright (C) 2003 Free Software Foundation, Inc. +dnl +dnl This file is free software; as a special exception the author gives +dnl unlimited permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl +dnl This file is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + +# GNUPG_PTH_VERSION_CHECK(REQUIRED) +# +# If the version is sufficient, HAVE_PTH will be set to yes. +# +# Taken and modified from the m4 macros which come with Pth. +AC_DEFUN([GNUPG_PTH_VERSION_CHECK], + [ + _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'` + _req_version="ifelse([$1],,1.2.0,$1)" + + AC_MSG_CHECKING(for PTH - version >= $_req_version) + for _var in _pth_version _req_version; do + eval "_val=\"\$${_var}\"" + _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'` + _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'` + _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'` + _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'` + case $_rtype in + "a" ) _rtype=0 ;; + "b" ) _rtype=1 ;; + "." ) _rtype=2 ;; + esac + _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \ + "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"` + eval "${_var}_hex=\"\$_hex\"" + done + have_pth=no + if test ".$_pth_version_hex" != .; then + if test ".$_req_version_hex" != .; then + if test $_pth_version_hex -ge $_req_version_hex; then + have_pth=yes + fi + fi + fi + if test $have_pth = yes; then + AC_MSG_RESULT(yes) + AC_MSG_CHECKING([whether PTH installation is sane]) + AC_CACHE_VAL(gnupg_cv_pth_is_sane,[ + _gnupg_pth_save_cflags=$CFLAGS + _gnupg_pth_save_ldflags=$LDFLAGS + _gnupg_pth_save_libs=$LIBS + CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`" + LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`" + LIBS="$LIBS `$PTH_CONFIG --libs`" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include + ], + [[ pth_init ();]])], + gnupg_cv_pth_is_sane=yes, + gnupg_cv_pth_is_sane=no) + CFLAGS=$_gnupg_pth_save_cflags + LDFLAGS=$_gnupg_pth_save_ldflags + LIBS=$_gnupg_pth_save_libs + ]) + if test $gnupg_cv_pth_is_sane != yes; then + have_pth=no + fi + AC_MSG_RESULT($gnupg_cv_pth_is_sane) + else + AC_MSG_RESULT(no) + fi + ]) + + +# +# GNUPG_PATH_PTH([MINIMUM_VERSION]) +# +# This is a special version of the check whioch assumes that a +# emulation for W32 systems is available. The test assumes that +# $have_w32_system has already been set. On return $have_pth is set +# as well as HAVE_PTH is defined and PTH_CLFAGS and PTH_LIBS are AS_SUBST. +# +AC_DEFUN([GNUPG_PATH_PTH], +[ AC_ARG_WITH(pth-prefix, + AC_HELP_STRING([--with-pth-prefix=PFX], + [prefix where GNU Pth is installed (optional)]), + pth_config_prefix="$withval", pth_config_prefix="") + if test x$pth_config_prefix != x ; then + PTH_CONFIG="$pth_config_prefix/bin/pth-config" + fi + AC_PATH_PROG(PTH_CONFIG, pth-config, no) + tmp=ifelse([$1], ,1.3.7,$1) + if test "$have_w32_system" = no; then + if test "$PTH_CONFIG" != "no"; then + GNUPG_PTH_VERSION_CHECK($tmp) + if test $have_pth = yes; then + PTH_CFLAGS=`$PTH_CONFIG --cflags` + PTH_LIBS=`$PTH_CONFIG --ldflags` + PTH_LIBS="$PTH_LIBS `$PTH_CONFIG --libs --all`" + AC_DEFINE(HAVE_PTH, 1, + [Defined if the GNU Pth is available]) + fi + fi + else + have_pth=yes + PTH_CFLAGS="" + PTH_LIBS="" + AC_DEFINE(HAVE_PTH, 1) + fi + AC_SUBST(PTH_CFLAGS) + AC_SUBST(PTH_LIBS) +]) + diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 index 16b664ce4..284447014 100644 --- a/m4/libassuan.m4 +++ b/m4/libassuan.m4 @@ -9,68 +9,152 @@ dnl This file is distributed in the hope that it will be useful, but dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS dnl -AC_DEFUN([AM_PATH_LIBASSUAN], +dnl Common code used for libassuan detection [internal] +dnl Returns ok set to yes or no. +dnl +AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], [ AC_ARG_WITH(libassuan-prefix, - AC_HELP_STRING([--with-libassuan-prefix=PFX], - [prefix where LIBASSUAN is installed (optional)]), + AC_HELP_STRING([--with-libassuan-prefix=PFX], + [prefix where LIBASSUAN is installed (optional)]), libassuan_config_prefix="$withval", libassuan_config_prefix="") if test x$libassuan_config_prefix != x ; then - libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" - if test x${LIBASSUAN_CONFIG+set} != xset ; then - LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config - fi + libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" + if test x${LIBASSUAN_CONFIG+set} != xset ; then + LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config + fi + fi + AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) + + tmp=ifelse([$1], ,1:0.9.2,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_libassuan_api=0 + min_libassuan_version="$tmp" fi - AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) - min_libassuan_version=ifelse([$1], ,0.0.1,$1) - AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) + if test "$LIBASSUAN_CONFIG" != "no" ; then + libassuan_version=`$LIBASSUAN_CONFIG --version` + fi + libassuan_version_major=`echo $libassuan_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + libassuan_version_minor=`echo $libassuan_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` + libassuan_version_micro=`echo $libassuan_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` + + AC_MSG_CHECKING(for LIBASSUAN ifelse([$2], ,,[$2 ])- version >= $min_libassuan_version) ok=no if test "$LIBASSUAN_CONFIG" != "no" ; then + ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; then]) req_major=`echo $min_libassuan_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` req_minor=`echo $min_libassuan_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` req_micro=`echo $min_libassuan_version | \ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - libassuan_config_version=`$LIBASSUAN_CONFIG $libassuan_config_args --version` - major=`echo $libassuan_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libassuan_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` - micro=`echo $libassuan_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - if test "$major" -gt "$req_major"; then + if test "$libassuan_version_major" -gt "$req_major"; then ok=yes else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then + if test "$libassuan_version_major" -eq "$req_major"; then + if test "$libassuan_version_minor" -gt "$req_minor"; then ok=yes else - if test "$minor" -eq "$req_minor"; then - if test "$micro" -ge "$req_micro"; then + if test "$libassuan_version_minor" -eq "$req_minor"; then + if test "$libassuan_version_micro" -ge "$req_micro"; then ok=yes fi fi fi fi fi + ifelse([$2], ,,[fi]) fi + + if test $ok = yes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + + if test $ok = yes; then + if test "$req_libassuan_api" -gt 0 ; then + tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING([LIBASSUAN ifelse([$2], ,,[$2 ])API version]) + if test "$req_libassuan_api" -eq "$tmp" ; then + AC_MSG_RESULT(okay) + else + ok=no + AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.]) + fi + fi + fi + fi + +]) + + + +dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS +dnl +AC_DEFUN([AM_PATH_LIBASSUAN], +[ _AM_PATH_LIBASSUAN_COMMON($1) if test $ok = yes; then LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` - AC_MSG_RESULT(yes) ifelse([$2], , :, [$2]) else LIBASSUAN_CFLAGS="" LIBASSUAN_LIBS="" - AC_MSG_RESULT(no) ifelse([$3], , :, [$3]) fi AC_SUBST(LIBASSUAN_CFLAGS) AC_SUBST(LIBASSUAN_LIBS) ]) + + +dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS +dnl +AC_DEFUN([AM_PATH_LIBASSUAN_PTH], +[ _AM_PATH_LIBASSUAN_COMMON($1,pth) + if test $ok = yes; then + LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags` + LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs` + ifelse([$2], , :, [$2]) + else + LIBASSUAN_PTH_CFLAGS="" + LIBASSUAN_PTH_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(LIBASSUAN_PTH_CFLAGS) + AC_SUBST(LIBASSUAN_PTH_LIBS) +]) + + +dnl AM_PATH_LIBASSUAN_PTHREAD([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS +dnl and LIBASSUAN_PTHREAD_LIBS +dnl +AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD], +[ _AM_PATH_LIBASSUAN_COMMON($1,pth) + if test $ok = yes; then + LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags` + LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs` + ifelse([$2], , :, [$2]) + else + LIBASSUAN_PTHREAD_CFLAGS="" + LIBASSUAN_PTHREAD_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(LIBASSUAN_PTHREAD_CFLAGS) + AC_SUBST(LIBASSUAN_PTHREAD_LIBS) +]) + diff --git a/po/be.po b/po/be.po index 7c082eae6..4e4bc5ad7 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -138,20 +138,20 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Паўтарыце пароль: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6479,7 +6479,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA патрабуе выкарыстаньня 160-і бітавага хэш-альгарытму\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index e3098f3d2..de67ce3cd 100644 --- a/po/ca.po +++ b/po/ca.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2005-02-04 02:04+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -160,22 +160,22 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "Introduïu el nom d'usuari: " -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Repetiu la contrasenya: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -7053,7 +7053,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA requereix l'ús d'un algoritme de dispersió de 160 bits\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/cs.po b/po/cs.po index cac0fa5f7..46862bc46 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -138,21 +138,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: nepodailo se vytvoit hashovac tabulku: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|PIN administrtora" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Opakujte tento PIN: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PIN nen zopakovn sprvn; zkuste to znovu" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "||Prosm vlote PIN%%0A[podpis hotov: %lu]" @@ -6744,7 +6744,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA poaduje pouit 160-ti bitovho hashovacho algoritmu\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/da.po b/po/da.po index 729c09971..d254e7c0b 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -138,22 +138,22 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "kunne ikke initialisere TillidsDB: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "Indtast bruger-id: " -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Gentag kodestning: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "kodestningen blev ikke ordentlig gentaget; prv igen.\n" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6633,7 +6633,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/de.po b/po/de.po index 17dc5d11c..83784dd14 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.9.90\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2006-09-25 09:09+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -141,19 +141,19 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "Fehler beim Speichern des Schlüssels: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "Admin PIN" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 msgid "Repeat this PIN" msgstr "PIN bitte wiederholen" -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren" @@ -6931,7 +6931,7 @@ msgstr "Die Zertifikatkette ist länger als von der CA erlaubt (%d)" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA benötigt einen 160-bit Hash Algorithmus\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "(Dies ist der MD2 Algorithmus)\n" diff --git a/po/el.po b/po/el.po index 710ac9dc4..4938b545e 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -137,21 +137,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: hashtable: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr " : " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr " . " -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6922,7 +6922,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr " DSA 160 bit hash\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/eo.po b/po/eo.po index 282a19af1..81d289b82 100644 --- a/po/eo.po +++ b/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -137,22 +137,22 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: malsukcesis krei haktabelon: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "Donu la uzantidentigilon: " -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Ripetu pasfrazon: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "la pasfrazo ne estis uste ripetita; provu denove" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6866,7 +6866,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/es.po b/po/es.po index 26e09cc3c..38b32ed44 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.4.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2005-03-25 16:50+0100\n" "Last-Translator: Jaime Surez \n" "Language-Team: Spanish \n" @@ -159,21 +159,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: fallo en la creacin de la tabla hash: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|PIN Administrador" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Repita este PIN: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PIN repetido incorrectamente; intntelo de nuevo" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "PIN [firmas hechas: %lu]" @@ -6785,7 +6785,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necesita un algoritmo de hash de 160 bits.\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/et.po b/po/et.po index 86f33c8b6..cf17f9036 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -137,21 +137,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: paisktabeli loomine ebannestus: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Korrake parooli: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "parooli ei korratud ieti; proovige uuesti" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6826,7 +6826,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA nuab 160 bitist rsialgoritmi kasutamist\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 10879fc6c..2931f974e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -153,21 +153,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Toista salasana: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "salasanaa ei toistettu oikein, yritä uudestaan." -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6905,7 +6905,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA vaatii 160-bittisen tiivistealgoritmin käyttöä\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index c5890d30b..13d2e5fca 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2005-06-28 00:24+0200\n" "Last-Translator: Gal Quri \n" "Language-Team: French \n" @@ -145,21 +145,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: la cration de la table de hachage a chou: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|code PIN d'administration" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Rptez ce code PIN: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "le code PIN n'a pas t correctement rpt ; recommencez" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "||Entrez le PIN%%0A[sigs faites: %lu]" @@ -6935,7 +6935,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA ncessite l'utilisation d'un algorithme de hachage de 160 bits\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 70f032634..1e8d6f40f 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -137,22 +137,22 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: fallo ao crear unha tboa hash: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "Introduza o ID de usuario: " -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Repita o contrasinal: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "o contrasinal non se repetiu correctamente; tnteo de novo" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6913,7 +6913,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA require o emprego dun algoritmo hash de 160 bits\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index cc052f82a..b4aef1f50 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc Lszl \n" "Language-Team: Hungarian \n" @@ -137,21 +137,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: Hashtbla ltrehozsa sikertelen: %s.\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Ismtelje meg a jelszt: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "Nem ismtelte meg helyesen a jelszt! Prblja jra!" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6866,7 +6866,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "A DSA 160 bites hash (kivonatol) algoritmust ignyel.\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/id.po b/po/id.po index 674e515f1..b7bb486eb 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -139,21 +139,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: gagal membuat hashtable: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Ulangi passphrase: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "passphrase tidak diulang dengan benar; coba lagi" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6869,7 +6869,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA butuh penggunaan algoritma hash 160 bit\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/it.po b/po/it.po index 1f02f492c..91a74107b 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -137,21 +137,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: creazione della tabella hash fallita: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Ripeti la passphrase: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "passphrase non ripetuta correttamente; prova ancora" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6917,7 +6917,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA richiede l'uso di un algoritmo di hashing con almeno 160 bit\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index b853d37e3..8ead5b324 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -140,21 +140,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: ϥåɽκ˼Ԥޤ: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|Admin PIN" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "PIN: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PINȷ֤Ƥޤ󡣺ϤƤ" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "PIN [̾: %lu]" @@ -6674,7 +6674,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSAǤ160ӥåȤΥϥå塦르ꥺλѤɬפǤ\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/nb.po b/po/nb.po index bb325004e..cef74efa9 100644 --- a/po/nb.po +++ b/po/nb.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.3\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2006-06-13 20:31+0200\n" "Last-Translator: Trond Endrestl \n" "Language-Team: Norwegian Bokml \n" @@ -140,21 +140,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "klarte ikke lagre nkkelen: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|Admin PIN" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Gjenta denne PIN: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PIN ble ikke gjentatt korrekt; prv igjen" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "||Vennligst tast inn PIN%%0A[signaturer utfrt: %lu]" @@ -6549,7 +6549,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA krever bruk av en 160-bit hashalgoritme\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 739b74a9e..3bcc4dd5f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -147,22 +147,22 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: tworzenie tablicy skrtw nie powiodo si: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "Podaj identyfikator uytkownika (user ID): " -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Powtrz haso: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "haso nie zostao poprawnie powtrzone; jeszcze jedna prba" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6911,7 +6911,7 @@ msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" "Algorytm DSA wymaga uycia algorytmu skrtu dajcego 160-bitowy wynik.\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index 84688515c..794b34aad 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -140,21 +140,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: falha ao criar tabela de disperso: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Repita a frase secreta: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "a frase secreta no foi repetida corretamente; tente outra vez" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6877,7 +6877,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necessita de utilizao de uma algoritmo de disperso de 160 bit\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0d99a32e3..4aed30638 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -144,22 +144,22 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: falha ao criar tabela de \"hash\": %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "Digite o identificador de usurio: " -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Repita a frase secreta: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "A frase secreta no foi repetida corretamente; tente outra vez.\n" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6825,7 +6825,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index e8f732b21..f568928e8 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2005-05-31 22:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -143,21 +143,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: am euat s creez hashtable: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|PIN Admin" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Repetai acest PIN: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PIN-ul nu a fost repetat corect; mai ncercai o dat" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "||V rugm introducei PIN%%0A[semnturi fcute: %lu]" @@ -6777,7 +6777,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA necesit folosirea unui algoritm cu hash de 160 bii\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index d40ab18bd..5af9aa8ca 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GnuPG 1.4.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2005-06-22 02:53+0200\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -139,21 +139,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: сбой создания таблицы хэшей: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|Административный PID" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Повторите ввод PIN: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "повторный ввод PIN некорректен; попробуйте еще раз" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "||Введите PIN%%0A[подписей: %lu]" @@ -6725,7 +6725,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA требует использования 160 битной хэш-функции\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index 4d1766536..3fa17e933 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -136,21 +136,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: nepodarilo sa vytvori hashovaciu tabuku: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Opakujte heslo: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "heslo nie je zopakovan sprvne; skste to znovu" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -6883,7 +6883,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA poaduje pouitie 160 bitovho hashovacieho algoritmu\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index 8bdd3a6f9..a3bf2d1b5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.6\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2004-12-01 17:49+0100\n" "Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" @@ -157,21 +157,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 msgid "Admin PIN" msgstr "" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Repetera lösenmeningen: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 #, fuzzy msgid "PIN not correctly repeated; try again" msgstr "lösenmeningen upprepades inte korrekt; försök igen." -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "" @@ -7038,7 +7038,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA kräver att du använder en 160-bitars kontrollsummealgoritm\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index a8ae0e106..20efc3a3b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2005-03-16 07:30+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -138,21 +138,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|Yönetici PIN'i" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "Bu PIN'i tekrarlayın: " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PIN doğru tekrarlanmadı; tekrar deneyin" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "PIN [yapılan imza: %lu]" @@ -6760,7 +6760,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA, 160 bitlik bir hash algoritması kullanılmasını gerektiriyor\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 91aa50441..9d61de206 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2006-07-02 10:58+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" @@ -142,21 +142,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s：建立散列表失败：%s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|管理员 PIN" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "再次输入此 PIN：" -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "PIN 再次输入时与首次输入不符；请再试一次" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "||请输入 PIN%%0A[完成的签字：%lu]" @@ -6578,7 +6578,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA 要求使用 160 位的散列算法\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 49e67872c..3100b0321 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2006-10-04 18:34+0200\n" +"POT-Creation-Date: 2006-10-06 19:14+0200\n" "PO-Revision-Date: 2005-07-29 09:49+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -140,21 +140,21 @@ msgstr "" msgid "failed to create stream from socket: %s\n" msgstr "%s: 建立雜湊表失敗: %s\n" -#: agent/divert-scd.c:217 +#: agent/divert-scd.c:219 #, fuzzy msgid "Admin PIN" msgstr "|A|Admin PIN" -#: agent/divert-scd.c:275 +#: agent/divert-scd.c:277 #, fuzzy msgid "Repeat this PIN" msgstr "請再次輸入個人識別碼 (PIN): " -#: agent/divert-scd.c:278 +#: agent/divert-scd.c:280 msgid "PIN not correctly repeated; try again" msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次" -#: agent/divert-scd.c:290 +#: agent/divert-scd.c:292 #, fuzzy, c-format msgid "Please enter the PIN%s%s%s to unlock the card" msgstr "||請輸入 PIN%%0A[簽署完成: %lu]" @@ -6618,7 +6618,7 @@ msgstr "" msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA 要求使用 160 位元的雜湊演算法\n" -#: sm/certcheck.c:175 sm/sign.c:479 sm/verify.c:189 +#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189 msgid "(this is the MD2 algorithm)\n" msgstr "" diff --git a/scd/ChangeLog b/scd/ChangeLog index 7bb5c97b1..9f6a0f5c5 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,10 @@ +2006-10-06 Werner Koch + + * Makefile.am (AM_CFLAGS): Use PTH version of libassuan. + (scdaemon_LDADD): Ditto. + + * scdaemon.h (send_status_info): Mark with sentinel attribute. + 2006-10-02 Marcus Brinkmann * command.c (update_reader_status_file): Increase buffer of diff --git a/scd/Makefile.am b/scd/Makefile.am index 61c0c05d9..63356dba8 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -29,7 +29,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am AM_CFLAGS = $(LIBGCRYPT_CFLAGS) \ - $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) + $(KSBA_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) card_apps = app-openpgp.c app-nks.c app-dinsig.c app-p15.c @@ -45,7 +45,7 @@ scdaemon_SOURCES = \ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \ + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ $(LIBUSB_LIBS) -lgpg-error $(LIBINTL) $(DL_LIBS) $(NETLIBS) # Removed for now: We need to decide whether it makes sense to @@ -63,7 +63,7 @@ scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \ #sc_copykeys_LDADD = \ # ../jnlib/libjnlib.a ../common/libcommon.a \ # ../common/libsimple-pwquery.a \ -# $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ +# $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ # $(LIBUSB_LIBS) \ # -lgpg-error @LIBINTL@ @DL_LIBS@ # diff --git a/scd/app-p15.c b/scd/app-p15.c index 21dbad47a..8e786dd97 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -3187,7 +3187,7 @@ do_sign (app_t app, const char *keyidstr, int hashalgo, /* Handler for the PKAUTH command. - This is basically the same as the PKSIGN command but we firstcheck + This is basically the same as the PKSIGN command but we first check that the requested key is suitable for authentication; that is, it must match the criteria used for the attribute $AUTHKEYID. See do_sign for calling conventions; there is no HASHALGO, though. */ diff --git a/scd/scdaemon.h b/scd/scdaemon.h index 6e81c0d20..40a398856 100644 --- a/scd/scdaemon.h +++ b/scd/scdaemon.h @@ -110,7 +110,8 @@ const char *scd_get_socket_name (void); /*-- command.c --*/ void scd_command_handler (int); -void send_status_info (ctrl_t ctrl, const char *keyword, ...); +void send_status_info (ctrl_t ctrl, const char *keyword, ...) + GNUPG_GCC_A_SENTINEL(1); void scd_update_reader_status_file (void); diff --git a/sm/ChangeLog b/sm/ChangeLog index 1a4157717..74c5c4302 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,8 @@ +2006-10-06 Werner Koch + + * Makefile.am (AM_CFLAGS): Use PTH version of libassuan. + (gpgsm_LDADD): Ditto. + 2006-10-05 Werner Koch * certcheck.c (do_encode_md): Check that the has algo is valid. diff --git a/sm/Makefile.am b/sm/Makefile.am index 915a7bc98..f3c4564b1 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = gpgsm -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) \ +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \ $(PTH_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl @@ -58,8 +58,8 @@ common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \ ../common/libcommon.a ../gl/libgnu.a gpgsm_LDADD = $(common_libs) \ - $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error \ - $(LIBINTL) $(PTH_LIBS) $(ZLIBS) + $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) \ + -lgpg-error $(LIBINTL) $(PTH_LIBS) $(ZLIBS) # Make sure that all libs are build before we use them. This is # important for things like make -j2. diff --git a/tools/ChangeLog b/tools/ChangeLog index e456ca34f..de22a2ec6 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2006-10-08 Werner Koch + + * Makefile.am (gpgkey2ssh_LDADD): Add LIBINTL. Suggested by + Andreas Metzler. + 2006-09-22 Werner Koch * no-libgcrypt.c: Changed license to a simple all permissive one. diff --git a/tools/Makefile.am b/tools/Makefile.am index 3024de301..41298503c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -79,8 +79,8 @@ gpgkey2ssh_SOURCES = gpgkey2ssh.c gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) # common sucks in jnlib, via use of BUG() in an inline function, which # some compilers do not eliminate. -gpgkey2ssh_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) +gpgkey2ssh_LDADD = $(common_libs) \ + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) # Make sure that all libs are build before we use them. This is