diff options
| author | Marcus Brinkmann <[email protected]> | 2003-05-04 22:28:33 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-05-04 22:28:33 +0000 |
| commit | 3cbd595c13ebe15207e8491101265ca9de8f2d5e (patch) | |
| tree | 737928222ebd2c01ba05e00ec1fd33cad3171366 | |
| parent | 2003-05-04 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-3cbd595c13ebe15207e8491101265ca9de8f2d5e.tar.gz gpgme-3cbd595c13ebe15207e8491101265ca9de8f2d5e.zip | |
2003-05-05 Marcus Brinkmann <[email protected]>
* key.c (_gpgme_key_append_name): Use decoded string to parse user id.
(_gpgme_key_add_sig): Likewise.
| -rw-r--r-- | gpgme/ChangeLog | 5 | ||||
| -rw-r--r-- | gpgme/key.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 1be551ff..a874048d 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2003-05-05 Marcus Brinkmann <[email protected]> + + * key.c (_gpgme_key_append_name): Use decoded string to parse user id. + (_gpgme_key_add_sig): Likewise. + 2003-05-04 Marcus Brinkmann <[email protected]> * context.h (struct gpgme_context_s): Remove member op_info. diff --git a/gpgme/key.c b/gpgme/key.c index d8e7ceee..97deb980 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); } |