From: Marcus Brinkmann <mb@g10code.com>
Date: Sun, 4 May 2003 22:28:33 +0000 (+0000)
Subject: 2003-05-05  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-0-4-1~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3cbd595c13ebe15207e8491101265ca9de8f2d5e;p=gpgme.git

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/gpgme/ChangeLog b/gpgme/ChangeLog
index 1be551f..a874048 100644
--- a/gpgme/ChangeLog
+++ b/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/gpgme/key.c b/gpgme/key.c
index d8e7cee..97deb98 100644
--- a/gpgme/key.c
+++ b/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);
     }