From 3bb21f3b80db0bce12d97f9792e56ef43ef49f50 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sun, 4 May 2003 22:28:33 +0000 Subject: [PATCH] 2003-05-05 Marcus Brinkmann * key.c (_gpgme_key_append_name): Use decoded string to parse user id. (_gpgme_key_add_sig): Likewise. --- trunk/gpgme/ChangeLog | 5 +++++ trunk/gpgme/key.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 1be551f..a874048 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2003-05-05 Marcus Brinkmann + + * key.c (_gpgme_key_append_name): Use decoded string to parse user id. + (_gpgme_key_add_sig): Likewise. + 2003-05-04 Marcus Brinkmann * context.h (struct gpgme_context_s): Remove member op_info. diff --git a/trunk/gpgme/key.c b/trunk/gpgme/key.c index d8e7cee..97deb98 100644 --- a/trunk/gpgme/key.c +++ b/trunk/gpgme/key.c @@ -222,10 +222,10 @@ _gpgme_key_append_name (GpgmeKey key, char *src) dst += src_len + 1; if (key->protocol == GPGME_PROTOCOL_CMS) - parse_x509_user_id (src, &uid->name, &uid->email, + parse_x509_user_id (uid->uid, &uid->name, &uid->email, &uid->comment, dst); else - parse_user_id (src, &uid->name, &uid->email, + parse_user_id (uid->uid, &uid->name, &uid->email, &uid->comment, dst); if (!key->uids) @@ -266,10 +266,10 @@ _gpgme_key_add_sig (GpgmeKey key, char *src) _gpgme_decode_c_string (src, &dst, src_len + 1); dst += src_len + 1; if (key->protocol == GPGME_PROTOCOL_CMS) - parse_x509_user_id (src, &sig->name, &sig->email, + parse_x509_user_id (sig->uid, &sig->name, &sig->email, &sig->comment, dst); else - parse_user_id (src, &sig->name, &sig->email, + parse_user_id (sig->uid, &sig->name, &sig->email, &sig->comment, dst); } -- 2.26.2