Mercurial > emacs
comparison lisp/gnus/starttls.el @ 90043:e24e2e78deda
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 04 Nov 2004 08:55:40 +0000 |
parents | 4c90ffeb71c5 df80d19d7a2e |
children | 3ebd9bdb4fe5 |
comparison
equal
deleted
inserted
replaced
90042:003d95404d71 | 90043:e24e2e78deda |
---|---|
124 | 124 |
125 (defcustom starttls-gnutls-program "gnutls-cli" | 125 (defcustom starttls-gnutls-program "gnutls-cli" |
126 "Name of GNUTLS command line tool. | 126 "Name of GNUTLS command line tool. |
127 This program is used when GNUTLS is used, i.e. when | 127 This program is used when GNUTLS is used, i.e. when |
128 `starttls-use-gnutls' is non-nil." | 128 `starttls-use-gnutls' is non-nil." |
129 :version "21.4" | |
129 :type 'string | 130 :type 'string |
130 :group 'starttls) | 131 :group 'starttls) |
131 | 132 |
132 (defcustom starttls-program "starttls" | 133 (defcustom starttls-program "starttls" |
133 "The program to run in a subprocess to open an TLSv1 connection. | 134 "The program to run in a subprocess to open an TLSv1 connection. |
136 :type 'string | 137 :type 'string |
137 :group 'starttls) | 138 :group 'starttls) |
138 | 139 |
139 (defcustom starttls-use-gnutls (not (executable-find starttls-program)) | 140 (defcustom starttls-use-gnutls (not (executable-find starttls-program)) |
140 "*Whether to use GNUTLS instead of the `starttls' command." | 141 "*Whether to use GNUTLS instead of the `starttls' command." |
142 :version "21.4" | |
141 :type 'boolean | 143 :type 'boolean |
142 :group 'starttls) | 144 :group 'starttls) |
143 | 145 |
144 (defcustom starttls-extra-args nil | 146 (defcustom starttls-extra-args nil |
145 "Extra arguments to `starttls-program'. | 147 "Extra arguments to `starttls-program'. |
154 `starttls-use-gnutls' is non-nil. | 156 `starttls-use-gnutls' is non-nil. |
155 | 157 |
156 For example, non-TLS compliant servers may require | 158 For example, non-TLS compliant servers may require |
157 '(\"--protocols\" \"ssl3\"). Invoke \"gnutls-cli --help\" to | 159 '(\"--protocols\" \"ssl3\"). Invoke \"gnutls-cli --help\" to |
158 find out which parameters are available." | 160 find out which parameters are available." |
161 :version "21.4" | |
159 :type '(repeat string) | 162 :type '(repeat string) |
160 :group 'starttls) | 163 :group 'starttls) |
161 | 164 |
162 (defcustom starttls-process-connection-type nil | 165 (defcustom starttls-process-connection-type nil |
163 "*Value for `process-connection-type' to use when starting STARTTLS process." | 166 "*Value for `process-connection-type' to use when starting STARTTLS process." |
167 :version "21.4" | |
164 :type 'boolean | 168 :type 'boolean |
165 :group 'starttls) | 169 :group 'starttls) |
166 | 170 |
167 (defcustom starttls-connect "- Simple Client Mode:\n\n" | 171 (defcustom starttls-connect "- Simple Client Mode:\n\n" |
168 "*Regular expression indicating successful connection. | 172 "*Regular expression indicating successful connection. |
169 The default is what GNUTLS's \"gnutls-cli\" outputs." | 173 The default is what GNUTLS's \"gnutls-cli\" outputs." |
170 ;; GNUTLS cli.c:main() print this string when it is starting to run | 174 ;; GNUTLS cli.c:main() print this string when it is starting to run |
171 ;; in the application read/write phase. If the logic, or the string | 175 ;; in the application read/write phase. If the logic, or the string |
172 ;; itself, is modified, this must be updated. | 176 ;; itself, is modified, this must be updated. |
177 :version "21.4" | |
173 :type 'regexp | 178 :type 'regexp |
174 :group 'starttls) | 179 :group 'starttls) |
175 | 180 |
176 (defcustom starttls-failure "\\*\\*\\* Handshake has failed" | 181 (defcustom starttls-failure "\\*\\*\\* Handshake has failed" |
177 "*Regular expression indicating failed TLS handshake. | 182 "*Regular expression indicating failed TLS handshake. |
178 The default is what GNUTLS's \"gnutls-cli\" outputs." | 183 The default is what GNUTLS's \"gnutls-cli\" outputs." |
179 ;; GNUTLS cli.c:do_handshake() print this string on failure. If the | 184 ;; GNUTLS cli.c:do_handshake() print this string on failure. If the |
180 ;; logic, or the string itself, is modified, this must be updated. | 185 ;; logic, or the string itself, is modified, this must be updated. |
186 :version "21.4" | |
181 :type 'regexp | 187 :type 'regexp |
182 :group 'starttls) | 188 :group 'starttls) |
183 | 189 |
184 (defcustom starttls-success "- Compression: " | 190 (defcustom starttls-success "- Compression: " |
185 "*Regular expression indicating completed TLS handshakes. | 191 "*Regular expression indicating completed TLS handshakes. |
186 The default is what GNUTLS's \"gnutls-cli\" outputs." | 192 The default is what GNUTLS's \"gnutls-cli\" outputs." |
187 ;; GNUTLS cli.c:do_handshake() calls, on success, | 193 ;; GNUTLS cli.c:do_handshake() calls, on success, |
188 ;; common.c:print_info(), that unconditionally print this string | 194 ;; common.c:print_info(), that unconditionally print this string |
189 ;; last. If that logic, or the string itself, is modified, this | 195 ;; last. If that logic, or the string itself, is modified, this |
190 ;; must be updated. | 196 ;; must be updated. |
197 :version "21.4" | |
191 :type 'regexp | 198 :type 'regexp |
192 :group 'starttls) | 199 :group 'starttls) |
193 | 200 |
194 (defun starttls-negotiate-gnutls (process) | 201 (defun starttls-negotiate-gnutls (process) |
195 "Negotiate TLS on process opened by `open-starttls-stream'. | 202 "Negotiate TLS on process opened by `open-starttls-stream'. |