[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] nsm 01/01: Format certificates prettier in the NSM
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] nsm 01/01: Format certificates prettier in the NSM |
Date: |
Tue, 18 Nov 2014 22:23:49 +0000 |
branch: nsm
commit fec33bf00c9973d92cf9595b3bdf6a5ded5c8abe
Author: Lars Magne Ingebrigtsen <address@hidden>
Date: Tue Nov 18 23:23:39 2014 +0100
Format certificates prettier in the NSM
(nsm-format-certificate): Format certificate prettier. Format
suggested by Toke Høiland-Jørgensen <address@hidden>.
---
lisp/ChangeLog | 2 ++
lisp/net/nsm.el | 31 ++++++++++++++++++++-----------
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd4c8fd..48400fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,6 +6,8 @@
(nsm-save-host-names): New variable.
(nsm-save-host): Use it to save host names in the network manager
database.
+ (nsm-format-certificate): Format certificate prettier. Format
+ suggested by Toke Høiland-Jørgensen <address@hidden>.
* mail/smtpmail.el (smtpmail-via-smtp): Warn unless encrypted if
we're sending a password.
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index c7731ec..9ac15fd 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -306,17 +306,26 @@ unencrypted."
(defun nsm-format-certificate (status)
(let ((cert (plist-get status :certificate)))
(when cert
- (format "Certificate issued by %s\nIssued to %s\nCertificate host name:
%s\nPublic key: %s, signature: %s, security level: %s\nValid from: %s, valid
to: %s\n"
- (nsm-certificate-part (plist-get cert :issuer) "CN")
- (or (nsm-certificate-part (plist-get cert :subject) "O")
- (nsm-certificate-part (plist-get cert :subject) "OU"))
- (nsm-certificate-part (plist-get cert :subject) "CN")
- (plist-get cert :public-key-algorithm)
- (plist-get cert :signature-algorithm)
- (propertize (plist-get cert :certificate-security-level)
- 'face 'bold)
- (plist-get cert :valid-from)
- (plist-get cert :valid-to)))))
+ (with-temp-buffer
+ (insert
+ "Certificate information\n"
+ "Issued by:" (nsm-certificate-part (plist-get cert :issuer) "CN") "\n"
+ "Issued to:" (or (nsm-certificate-part (plist-get cert :subject) "O")
+ (nsm-certificate-part (plist-get cert :subject) "OU"))
+ "\n"
+ "Hostname:" (nsm-certificate-part (plist-get cert :subject) "CN") "\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"
+ "Valid:From " (plist-get cert :valid-from)
+ " to " (plist-get cert :valid-to) "\n\n")
+ (goto-char (point-min))
+ (while (re-search-forward "^[^:]+:" nil t)
+ (insert (make-string (- 20 (current-column)) ? )))
+ (buffer-string)))))
(defun nsm-certificate-part (string part)
(cadr (assoc part (nsm-parse-subject string))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] nsm 01/01: Format certificates prettier in the NSM,
Lars Ingebrigtsen <=