michael@30: Index: agent/genkey.c
michael@30: --- agent/genkey.c.orig	2007-11-19 16:11:31 +0100
michael@30: +++ agent/genkey.c	2007-12-21 09:17:46 +0100
michael@30: @@ -188,11 +188,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@30: --- configure.orig	2007-12-20 09:40:04 +0100
michael@30: +++ configure	2007-12-21 09:08:55 +0100
michael@30: @@ -6909,13 +6909,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@30:  { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
michael@30:  echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
michael@30:  if test "${ac_cv_search_dlopen+set}" = set; then
michael@30:    echo $ECHO_N "(cached) $ECHO_C" >&6
michael@30:  else
michael@30:    ac_func_search_save_LIBS=$LIBS
michael@30: +  LIBS=""
michael@30:  cat >conftest.$ac_ext <<_ACEOF
michael@30:  /* confdefs.h.  */
michael@30:  _ACEOF
michael@107: Index: configure
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);