* net/nsm.el (nsm-format-certificate): Don't bug out on missing elements

2 files changed, 18 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81e28726209..bd2199131f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/nsm.el (nsm-format-certificate): Don't bug out on missing
+        elements.
+
 2014-11-25  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * net/nsm.el (nsm-check-tls-connection, nsm-save-host)
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 35edd07fb6d..daf4bf5dc64 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -373,13 +373,19 @@ unencrypted."
              (nsm-certificate-part (plist-get cert :subject) "OU" t))
          "\n"
          "Hostname:"
-         (nsm-certificate-part (plist-get cert :subject) "CN" t) "\n"
-         "Public key:" (plist-get cert :public-key-algorithm)
-         ", signature: " (plist-get cert :signature-algorithm) "\n"
-         "Security level:"
-         (propertize (plist-get cert :certificate-security-level)
-                     'face 'bold)
-         "\n"
+         (nsm-certificate-part (plist-get cert :subject) "CN" t) "\n")
+        (when (and (plist-get cert :public-key-algorithm)
+                   (plist-get cert :signature-algorithm))
+          (insert
+           "Public key:" (plist-get cert :public-key-algorithm)
+           ", signature: " (plist-get cert :signature-algorithm) "\n"))
+        (when (plist-get cert :certificate-security-level)
+          (insert
+           "Security level:"
+           (propertize (plist-get cert :certificate-security-level)
+                       'face 'bold)
+           "\n"))
+        (insert
          "Valid:From " (plist-get cert :valid-from)
          " to " (plist-get cert :valid-to) "\n\n")
         (goto-char (point-min))