* epg.el (epg--make-sub-key-1): Don't set expiration-time if it is "0".

diff --git a/ChangeLog b/ChangeLog
index be6aa66..9607b50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 
        * epg.el (epg--status-VALIDSIG): Don't set expiration-time if it
        is "0".
+       (epg--make-sub-key-1): Ditto.
 
        * pgg-epg.el (pgg-epg-encrypt-region): Ask a user whether to skip a
        recipient whose public key is not available.

diff --git a/epg.el b/epg.el
index 243292c..366e4b6 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1672,7 +1672,8 @@ This function is for internal use only."
    (string-to-number (aref line 2))
    (aref line 4)
    (epg--time-from-seconds (aref line 5))
-   (epg--time-from-seconds (aref line 6))))
+   (unless (equal (aref line 6) "0")
+     (epg--time-from-seconds (aref line 6)))))
 
 ;;;###autoload
 (defun epg-list-keys (context &optional name mode)