[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 63ca642 01/02: * net/nsm.el (nsm-format-certificate
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 63ca642 01/02: * net/nsm.el (nsm-format-certificate): Don't bug out on missing elements |
Date: |
Tue, 25 Nov 2014 15:13:17 +0000 |
branch: master
commit 63ca64241c057695aa5d5a189b3de6d8ada310b8
Author: Lars Magne Ingebrigtsen <address@hidden>
Date: Tue Nov 25 16:12:47 2014 +0100
* net/nsm.el (nsm-format-certificate): Don't bug out on missing elements
---
lisp/ChangeLog | 5 +++++
lisp/net/nsm.el | 20 +++++++++++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81e2872..bd21991 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-25 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/nsm.el (nsm-format-certificate): Don't bug out on missing
+ elements.
+
2014-11-25 Teodor Zlatanov <address@hidden>
* net/nsm.el (nsm-check-tls-connection, nsm-save-host)
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 35edd07..daf4bf5 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))