From d68fe4f73d00cf13dddfd18bf08d4aded176fdad Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 4 Oct 2002 05:43:54 +0000
Subject: * import.c (import_keys_internal): s/inp/inp2/ to avoid shadowing
 warning.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* passphrase.c (agent_get_passphrase): Fixed signed/unsigned char
problem in %-escaping.  Noted by Ingo Kl�cker.
---
 g10/passphrase.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'g10/passphrase.c')

diff --git a/g10/passphrase.c b/g10/passphrase.c
index 0da40e3c0..d84d6e88b 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -732,6 +732,7 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text )
   else
     { /* The new Assuan protocol */
       char *line, *p;
+      const unsigned char *s;
       int i; 
 
       if (!tryagain_text)
@@ -751,33 +752,33 @@ agent_get_passphrase ( u32 *keyid, int mode, const char *tryagain_text )
       else
         *p++ = 'X'; /* no caching */
       *p++ = ' ';
-      for (i=0; tryagain_text[i]; i++)
+      for (i=0, s=tryagain_text; *s; s++)
         {
-          if (tryagain_text[i] < ' ' || tryagain_text[i] == '+')
+          if (*s < ' ' || *s == '+')
             {
-              sprintf (p, "%%%02X", tryagain_text[i]);
+              sprintf (p, "%%%02X", *s);
               p += 3;
             }
-          else if (tryagain_text[i] == ' ')
+          else if (*s == ' ')
             *p++ = '+';
           else
-            *p++ = tryagain_text[i];
+            *p++ = *s;
         }
       *p++ = ' ';
       *p++ = 'X'; /* Use the standard prompt */
       *p++ = ' ';
       /* copy description */
-      for (i=0; atext[i]; i++)
+      for (i=0, s= atext; *s; s++)
         {
-          if (atext[i] < ' ' || atext[i] == '+')
+          if (*s < ' ' || *s == '+')
             {
-              sprintf (p, "%%%02X", atext[i]);
+              sprintf (p, "%%%02X", *s);
               p += 3;
             }
-          else if (atext[i] == ' ')
+          else if (*s == ' ')
             *p++ = '+';
           else
-            *p++ = atext[i];
+            *p++ = *s;
         }
       *p++ = '\n';
       i = writen (fd, line, p - line);
-- 
cgit v1.2.3