mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* getkey.c (get_user_id_native): Renamed to ..
(get_user_id_printable): this. Filter out all dangerous characters. Checked all usages. (get_user_id_string_native): Renamed to.. (get_user_id_string_printable): this. Filter out all dangerous characters. Checked all usages. * keyedit.c (show_basic_key_info): New. * keylist.c (print_fingerprint): New mode 3. * import.c (import_one): Use new function to display the user ID.
This commit is contained in:
parent
5201d1ec9d
commit
89f8e7ef36
11 changed files with 120 additions and 38 deletions
17
g10/getkey.c
17
g10/getkey.c
|
@ -2323,13 +2323,14 @@ get_user_id_string( u32 *keyid )
|
|||
|
||||
|
||||
char*
|
||||
get_user_id_string_native( u32 *keyid )
|
||||
get_user_id_string_printable ( u32 *keyid )
|
||||
{
|
||||
char *p = get_user_id_string( keyid );
|
||||
char *p2 = utf8_to_native( p, strlen(p), 0 );
|
||||
|
||||
m_free(p);
|
||||
return p2;
|
||||
p = make_printable_string (p2, strlen (p2), 0);
|
||||
m_free (p2);
|
||||
return p;
|
||||
}
|
||||
|
||||
|
||||
|
@ -2386,17 +2387,19 @@ get_user_id( u32 *keyid, size_t *rn )
|
|||
}
|
||||
|
||||
char*
|
||||
get_user_id_native( u32 *keyid )
|
||||
get_user_id_printable( u32 *keyid )
|
||||
{
|
||||
size_t rn;
|
||||
|
||||
char *p = get_user_id( keyid, &rn );
|
||||
char *p2 = utf8_to_native( p, rn, 0 );
|
||||
|
||||
m_free(p);
|
||||
return p2;
|
||||
p = make_printable_string (p2, strlen (p2), 0);
|
||||
m_free (p2);
|
||||
return p;
|
||||
}
|
||||
|
||||
|
||||
|
||||
KEYDB_HANDLE
|
||||
get_ctx_handle(GETKEY_CTX ctx)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue