michael@30: Index: agent/genkey.c
michael@286: --- agent/genkey.c.orig	2009-06-29 08:20:15 +0200
michael@286: +++ agent/genkey.c	2009-09-06 22:59:18 +0200
michael@286: @@ -190,11 +190,9 @@
michael@30:          return gpg_error (GPG_ERR_INV_PASSPHRASE);
michael@30:  
michael@30:        desc = xtryasprintf 
michael@30: -        ( ngettext ("Warning: You have entered an insecure passphrase.%%0A"
michael@30: +        (           "Warning: You have entered an insecure passphrase.%%0A"
michael@30:                      "A passphrase should be at least %u character long.", 
michael@30: -                    "Warning: You have entered an insecure passphrase.%%0A"
michael@30: -                    "A passphrase should be at least %u characters long.", 
michael@30: -                    minlen), minlen );
michael@30: +                    minlen);
michael@30:        if (!desc)
michael@30:          return gpg_error_from_syserror ();
michael@30:        err = take_this_one_anyway (ctrl, desc);
michael@30: Index: configure
michael@286: --- configure.orig	2009-09-04 18:09:14 +0200
michael@286: +++ configure	2009-09-06 23:05:29 +0200
michael@373: @@ -7782,13 +7782,13 @@
michael@30:  # Check wether it is necessary to link against libdl.
michael@30:  #
michael@30:  gnupg_dlopen_save_libs="$LIBS"
michael@30: -LIBS=""
michael@286:  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
michael@286:  $as_echo_n "checking for library containing dlopen... " >&6; }
michael@286:  if test "${ac_cv_search_dlopen+set}" = set; then :
michael@286:    $as_echo_n "(cached) " >&6
michael@30:  else
michael@30:    ac_func_search_save_LIBS=$LIBS
michael@30: +  LIBS=""
michael@286:  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
michael@286:  /* end confdefs.h.  */
michael@286:  
michael@286: Index: g10/seckey-cert.c
michael@107: --- g10/seckey-cert.c.orig	2008-03-18 17:46:32.000000000 +0100
michael@107: +++ g10/seckey-cert.c	2009-02-18 21:25:25.508715635 +0100
michael@107: @@ -209,6 +209,11 @@
michael@107:                  csum += checksum (buffer, ndata);
michael@107:                  gcry_mpi_release (sk->skey[i]);
michael@107:  
michael@107: +        if (sk->protect.algo==CIPHER_ALGO_IDEA) {
michael@107: +            buffer[0] = 0;
michael@107: +            buffer[1] = 0;
michael@107: +        }
michael@107: +
michael@107:  		err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP,
michael@107:  				     buffer, ndata, &ndata );
michael@107:  		xfree (buffer);