Fix problems with non-ASCII non-encoded PGP names

* lisp/epg.el (epg-signature-to-string): User IDs may be
non-encoded, non-ASCII (bug#50706).

diff --git a/lisp/epg.el b/lisp/epg.el
index a461afac34bce3f3459e4fd7d6d69466b45ea2a0..1d37cbcfb577bed7723950d7e748000eef2f07b4 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -433,7 +433,11 @@ callback data (if any)."
      (and user-id
          (concat " "
                  (if (stringp user-id)
-                     (rfc6068-unhexify-string user-id)
+                      (if (= (length user-id) (string-bytes user-id))
+                          ;; This is ASCII, possibly %-encoded.
+                         (rfc6068-unhexify-string user-id)
+                        ;; Non-ASCII, return as is.
+                        user-id)
                    (epg-decode-dn user-id))))
      (and (epg-signature-validity signature)
          (format " (trust %s)"  (epg-signature-validity signature)))