diff options
Diffstat (limited to 'lisp/obsolete/tls.el')
| -rw-r--r-- | lisp/obsolete/tls.el | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/lisp/obsolete/tls.el b/lisp/obsolete/tls.el index 67a497f9412..5cba18d7897 100644 --- a/lisp/obsolete/tls.el +++ b/lisp/obsolete/tls.el @@ -1,4 +1,4 @@ -;;; tls.el --- TLS/SSL support via wrapper around GnuTLS +;;; tls.el --- TLS/SSL support via wrapper around GnuTLS -*- lexical-binding: t; -*- ;; Copyright (C) 1996-1999, 2002-2021 Free Software Foundation, Inc. @@ -70,8 +70,7 @@ Client data stream begins after the last character this matches. The default matches the output of \"gnutls-cli\" (version 2.0.1)." :version "22.2" - :type 'regexp - :group 'tls) + :type 'regexp) (defcustom tls-program '("gnutls-cli --x509cafile %t -p %p %h" @@ -104,22 +103,19 @@ successful negotiation." (repeat :inline t :tag "Other" (string))) (list :tag "List of commands" (repeat :tag "Command" (string)))) - :version "26.1" ; remove s_client - :group 'tls) + :version "26.1") (defcustom tls-process-connection-type nil "Value for `process-connection-type' to use when starting TLS process." :version "22.1" - :type 'boolean - :group 'tls) + :type 'boolean) (defcustom tls-success "- Handshake was completed\\|SSL handshake has read " "Regular expression indicating completed TLS handshakes. The default is what GnuTLS's \"gnutls-cli\" outputs." ;; or OpenSSL's \"openssl s_client\" :version "22.1" - :type 'regexp - :group 'tls) + :type 'regexp) (defcustom tls-checktrust nil "Indicate if certificates should be checked against trusted root certs. @@ -137,8 +133,7 @@ consider trustworthy, e.g.: :type '(choice (const :tag "Always" t) (const :tag "Never" nil) (const :tag "Ask" ask)) - :version "23.1" ;; No Gnus - :group 'tls) + :version "23.1") (defcustom tls-untrusted "- Peer's certificate is NOT trusted\\|Verify return code: \\([^0] \\|.[^ ]\\)" @@ -147,8 +142,7 @@ The default is what GnuTLS's \"gnutls-cli\" returns in the event of unsuccessful verification." ;; or OpenSSL's \"openssl s_client\" :type 'regexp - :version "23.1" ;; No Gnus - :group 'tls) + :version "23.1") (defcustom tls-hostmismatch "# The hostname in the certificate does NOT match" @@ -158,20 +152,13 @@ name of the host you are connecting to, gnutls-cli issues a warning to this effect. There is no such feature in openssl. Set this to nil if you want to ignore host name mismatches." :type 'regexp - :version "23.1" ;; No Gnus - :group 'tls) + :version "23.1") (defcustom tls-certtool-program "certtool" "Name of GnuTLS certtool. Used by `tls-certificate-information'." :version "22.1" - :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)) + :type 'string) (defun tls-certificate-information (der) "Parse X.509 certificate in DER format into an assoc list." @@ -272,7 +259,7 @@ 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 - (tls-format-message "\ + (format-message "\ The certificate presented by `%s' is NOT trusted. Accept anyway? " host))))) (and tls-hostmismatch (save-excursion |