GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-10-23 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* rungpg.c (gpg_keylist_preprocess): Convert percent escaped
	string to C coded string.
This commit is contained in:
Marcus Brinkmann 2008-10-23 10:51:31 +00:00
parent eae8d3830c
commit 69b1a65fb8
2 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gpgme/ChangeLog
View File

@ -1,3 +1,8 @@
2008-10-23 Marcus Brinkmann <marcus@g10code.de>
* rungpg.c (gpg_keylist_preprocess): Convert percent escaped
string to C coded string.
2008-10-20 Werner Koch <wk@g10code.com> 2008-10-20 Werner Koch <wk@g10code.com>
* Makefile.am (EXTRA_DIST): Add gpgme.h.in. * Makefile.am (EXTRA_DIST): Add gpgme.h.in.

43
gpgme/rungpg.c
View File

@ -1878,12 +1878,47 @@ gpg_keylist_preprocess (char *line, char **r_line)
HTTP Keyserver Protocol (draft). HTTP Keyserver Protocol (draft).
We want: We want:
uid:o<flags>::::<creatdate>:<expdate>:::<uid>: uid:o<flags>::::<creatdate>:<expdate>:::<c-coded uid>:
*/ */
if (asprintf (r_line, "uid:o%s::::%s:%s:::%s:", {
field[4], field[2], field[3], field[1]) < 0) /* The user ID is percent escaped, but we want c-coded.
return gpg_error_from_errno (errno); Because we have to replace each '%HL' by '\xHL', we need at
most 4/3 th the number of bytes. But because this
security software, we err on the good side and allocate
twice as much. */
char *uid = malloc (2 * strlen (field[1]) + 1);
char *src;
char *dst;
if (! uid)
return gpg_error_from_errno (errno);
src = field[1];
dst = uid;
while (*src)
{
if (*src == '%')
{
*(dst++) = '\\';
*(dst++) = 'x';
src++;
/* Copy the next two bytes unconditionally. This is
what reduces the maximum number of needed bytes
from 2n+1 to (4/3)n+1, even for invalid strings. */
if (*src)
*(dst++) = *(src++);
if (*src)
*(dst++) = *(src++);
}
else
*(dst++) = *(src++);
}
*dst = '\0';
if (asprintf (r_line, "uid:o%s::::%s:%s:::%s:",
field[4], field[2], field[3], uid) < 0)
return gpg_error_from_errno (errno);
}
return 0; return 0;
case RT_NONE: case RT_NONE: