UTF8-decode PGP user ID packets.

diff --git a/pgppubring.c b/pgppubring.c
index c3499ea6a4680c32d43f79e2886b9f8d202fed11..087d6d61703e005fe05af0a380e6287d2caa4099 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -26,6 +26,7 @@
 #include "sha.h"
 #include "mutt.h"
 #include "pgp.h"
+#include "charset.h"
 
 #define CHUNKSIZE 1024
 
@@ -726,6 +727,7 @@ static KEYINFO *pgp_read_keyring(const char *fname)
   KEYINFO *supkey = NULL;
   PGPUID *uid = NULL;
   LIST **addr = NULL;
+  CHARSET *chs = mutt_get_charset(Charset);
   
   if(!(fp = fopen(fname, "r")))
   {
@@ -796,6 +798,7 @@ static KEYINFO *pgp_read_keyring(const char *fname)
        chr = safe_malloc(l);
        memcpy(chr, buff + 1, l - 1);
        chr[l-1] = '\0';
+       mutt_decode_utf8_string(chr, chs);
        *addr = mutt_new_list();
        (*addr)->data = safe_malloc(sizeof(PGPUID));
        uid = (PGPUID *) (*addr)->data;