[svn] GnuPG - r5269 - branches/STABLE-BRANCH-2-0/agent

[svn author wk]

Author: wk
Date: 2010-02-18 11:45:01 +0100 (Thu, 18 Feb 2010)
New Revision: 5269

Modified:
   branches/STABLE-BRANCH-2-0/agent/ChangeLog
   branches/STABLE-BRANCH-2-0/agent/call-pinentry.c
   branches/STABLE-BRANCH-2-0/agent/command.c
   branches/STABLE-BRANCH-2-0/agent/protect.c
Log:
Fixed backport of libassuan-2 changes.


Modified: branches/STABLE-BRANCH-2-0/agent/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/ChangeLog	2010-02-18 09:52:28 UTC (rev 5268)
+++ branches/STABLE-BRANCH-2-0/agent/ChangeLog	2010-02-18 10:45:01 UTC (rev 5269)
@@ -1,3 +1,11 @@
+2010-02-18  Werner Koch  <wk at g10code.com>
+
+	* protect.c (agent_unprotect): Initialize CLEARTEXT.
+
+	* command.c (register_commands): Unconditionally use
+	assuan_register_post_cmd_notify.
+	(start_command_handler): Undocumented use assuan_set_io_monitor.
+
 2010-02-17  Werner Koch  <wk at g10code.com>
 
 	* call-pinentry.c (start_pinentry): Always free OPTSTR.  Send

Modified: branches/STABLE-BRANCH-2-0/agent/call-pinentry.c
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/call-pinentry.c	2010-02-18 09:52:28 UTC (rev 5268)
+++ branches/STABLE-BRANCH-2-0/agent/call-pinentry.c	2010-02-18 10:45:01 UTC (rev 5269)
@@ -406,7 +406,7 @@
 
     for (idx=0; tbl[idx].key; idx++)
       {
-        if (asprintf (&optstr, "OPTION default-ok=%s",
+        if (asprintf (&optstr, "OPTION default-%s=%s",
                       tbl[idx].key, _(tbl[idx].value)) < 0 )
           return unlock_pinentry (out_of_core ());
         assuan_transact (entry_ctx, optstr, NULL, NULL, NULL, NULL, NULL,

Modified: branches/STABLE-BRANCH-2-0/agent/command.c
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/command.c	2010-02-18 09:52:28 UTC (rev 5268)
+++ branches/STABLE-BRANCH-2-0/agent/command.c	2010-02-18 10:45:01 UTC (rev 5269)
@@ -1897,9 +1897,7 @@
       if (rc)
         return rc;
     } 
-#ifdef HAVE_ASSUAN_SET_IO_MONITOR
   assuan_register_post_cmd_notify (ctx, post_cmd_notify);
-#endif
   assuan_register_reset_notify (ctx, reset_notify);
   assuan_register_option_handler (ctx, option_handler);
   return 0;
@@ -1962,9 +1960,7 @@
   ctrl->server_local->use_cache_for_signing = 1;
   ctrl->digest.raw_value = 0;
 
-#ifdef HAVE_ASSUAN_SET_IO_MONITOR
   assuan_set_io_monitor (ctx, io_monitor, NULL);
-#endif
 
   for (;;)
     {

Modified: branches/STABLE-BRANCH-2-0/agent/protect.c
===================================================================
--- branches/STABLE-BRANCH-2-0/agent/protect.c	2010-02-18 09:52:28 UTC (rev 5268)
+++ branches/STABLE-BRANCH-2-0/agent/protect.c	2010-02-18 10:45:01 UTC (rev 5269)
@@ -778,7 +778,7 @@
   unsigned long s2kcount;
   const unsigned char *iv;
   const unsigned char *prot_begin;
-  unsigned char *cleartext;
+  unsigned char *cleartext = NULL; /* Just to avoid gcc warning.  */
   unsigned char *final;
   size_t finallen;
   size_t cutoff, cutlen;