* epg.el (epg-signature-to-string): Decode DN.

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index 672a7a9..bcf3675 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -168,7 +168,7 @@
                                   compress-algorithm)
   "Return a context object."
   (cons 'epg-context
-       (vector protocol armor textmode include-certs
+       (vector (or protocol 'OpenPGP) armor textmode include-certs
                cipher-algorithm digest-algorithm compress-algorithm
                #'epg-passphrase-callback-function
                #'epg-progress-callback-function
@@ -594,7 +594,11 @@ This function is for internal use only."
            "No public key for "))
      (epg-signature-key-id signature)
      (if user-id
-        (concat " from " user-id " ")
+        (concat " from "
+                (if (stringp user-id)
+                    user-id
+                  (epg-decode-dn user-id))
+                " ")
        "")
      (if (epg-signature-validity signature)
         (format "(trust %s)"  (epg-signature-validity signature))