2003-05-05 Marcus Brinkmann <marcus@g10code.de>

	* key.c (_gpgme_key_append_name): Use decoded string to parse user id.
	(_gpgme_key_add_sig): Likewise.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 1be551ffb0c9d14053ed6f2a2aff6b4a4dc25a6b..a874048d3a3d6d5f38ed89d715df64d2f5066164 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-05  Marcus Brinkmann  <marcus@g10code.de>
+
+       * key.c (_gpgme_key_append_name): Use decoded string to parse user id.
+       (_gpgme_key_add_sig): Likewise.
+
 2003-05-04  Marcus Brinkmann  <marcus@g10code.de>
 
        * context.h (struct gpgme_context_s): Remove member op_info.

diff --git a/trunk/gpgme/key.c b/trunk/gpgme/key.c
index d8e7ceee96804a503b8b8b2db877ddf4a8e37f10..97deb980303dd4e7dfae1b6da508185fe02f0c6c 100644 (file)
--- 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);
     }