mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* hkp.c (dehtmlize): Understand the quote character (i.e. """) in
HTML responses. * keydb.h, getkey.c (get_user_id_printable): Rename to get_user_id_native and remove the printable stuff since we're print-ifying valid utf8 characters. Change all callers in import.c, sign.c, and encode.c.
This commit is contained in:
parent
081a9b6fb7
commit
297459b28b
7 changed files with 43 additions and 26 deletions
28
g10/getkey.c
28
g10/getkey.c
|
@ -1,5 +1,5 @@
|
|||
/* getkey.c - Get a key from the database
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
|
||||
* 2004 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
|
@ -2611,14 +2611,12 @@ get_user_id_string( u32 *keyid )
|
|||
|
||||
|
||||
char*
|
||||
get_user_id_string_printable ( u32 *keyid )
|
||||
get_user_id_string_native ( u32 *keyid )
|
||||
{
|
||||
char *p = get_user_id_string( keyid );
|
||||
char *p2 = utf8_to_native( p, strlen(p), 0 );
|
||||
m_free(p);
|
||||
p = make_printable_string (p2, strlen (p2), 0);
|
||||
m_free (p2);
|
||||
return p;
|
||||
char *p = get_user_id_string( keyid );
|
||||
char *p2 = utf8_to_native( p, strlen(p), 0 );
|
||||
m_free(p);
|
||||
return p2;
|
||||
}
|
||||
|
||||
|
||||
|
@ -2675,15 +2673,13 @@ get_user_id( u32 *keyid, size_t *rn )
|
|||
}
|
||||
|
||||
char*
|
||||
get_user_id_printable( u32 *keyid )
|
||||
get_user_id_native( u32 *keyid )
|
||||
{
|
||||
size_t rn;
|
||||
char *p = get_user_id( keyid, &rn );
|
||||
char *p2 = utf8_to_native( p, rn, 0 );
|
||||
m_free(p);
|
||||
p = make_printable_string (p2, strlen (p2), 0);
|
||||
m_free (p2);
|
||||
return p;
|
||||
size_t rn;
|
||||
char *p = get_user_id( keyid, &rn );
|
||||
char *p2 = utf8_to_native( p, rn, 0 );
|
||||
m_free(p);
|
||||
return p2;
|
||||
}
|
||||
|
||||
KEYDB_HANDLE
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue