projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use defalias at the top level
[gnus]
/
lisp
/
tls.el
diff --git
a/lisp/tls.el
b/lisp/tls.el
index
8d7c695
..
544aec5
100644
(file)
--- a/
lisp/tls.el
+++ b/
lisp/tls.el
@@
-1,6
+1,6
@@
;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
-;; Copyright (C) 1996-1999, 2002-201
4
Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2002-201
5
Free Software Foundation, Inc.
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: comm, tls, gnutls, ssl
;; Author: Simon Josefsson <simon@josefsson.org>
;; Keywords: comm, tls, gnutls, ssl
@@
-80,8
+80,7
@@
and `gnutls-cli' (version 2.0.1) output."
"List of strings containing commands to start TLS stream to a host.
Each entry in the list is tried until a connection is successful.
%h is replaced with server hostname, %p with port to connect to.
"List of strings containing commands to start TLS stream to a host.
Each entry in the list is tried until a connection is successful.
%h is replaced with server hostname, %p with port to connect to.
-The program should read input on stdin and write output to
-stdout.
+The program should read input on stdin and write output to stdout.
See `tls-checktrust' on how to check trusted root certs.
See `tls-checktrust' on how to check trusted root certs.
@@
-175,6
+174,11
@@
Used by `tls-certificate-information'."
:type 'string
:group 'tls)
:type 'string
:group 'tls)
+(defalias 'tls-format-message
+ (if (fboundp 'format-message) 'format-message
+ ;; for Emacs < 25, and XEmacs, don't worry about quote translation.
+ 'format))
+
(defun tls-certificate-information (der)
"Parse X.509 certificate in DER format into an assoc list."
(let ((certificate (concat "-----BEGIN CERTIFICATE-----\n"
(defun tls-certificate-information (der)
"Parse X.509 certificate in DER format into an assoc list."
(let ((certificate (concat "-----BEGIN CERTIFICATE-----\n"
@@
-276,8
+280,8
@@
Fourth arg PORT is an integer specifying a port to connect to."
(message "The certificate presented by `%s' is \
NOT trusted." host))
(not (yes-or-no-p
(message "The certificate presented by `%s' is \
NOT trusted." host))
(not (yes-or-no-p
- (
format "The certificate presented by `%s' is
\
-NOT trusted. Accept anyway? " host)))))
+ (
tls-format-message "
\
+
The certificate presented by `%s' is
NOT trusted. Accept anyway? " host)))))
(and tls-hostmismatch
(save-excursion
(goto-char (point-min))
(and tls-hostmismatch
(save-excursion
(goto-char (point-min))