aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog3
-rw-r--r--g10/keyserver.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 523b39791..aaa2274b5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
2008-03-25 Werner Koch <[email protected]>
+ * keyserver.c (parse_keyrec): Take care of char defaulting to
+ unsigned when using hextobyte.
+
* options.skel: Make the default keyserver keys.gnupg.net.
2008-03-23 David Shaw <[email protected]>
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 227af1afb..adeee5935 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -679,9 +679,9 @@ parse_keyrec(char *keystring)
while(*tok)
if(tok[0]=='%' && tok[1] && tok[2])
{
- if((userid[i]=hextobyte(&tok[1]))==-1)
- userid[i]='?';
+ int c;
+ userid[i] = (c=hextobyte(&tok[1])) == -1 ? '?' : c;
i++;
tok+=3;
}