Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
aecb42aa
Commit
aecb42aa
authored
Oct 01, 2010
by
Lars Magne Ingebrigtsen
Committed by
Katsumi Yamaoka
Oct 01, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Give up on using gnutls-cli for starttls.
parent
088dcc3e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
lisp/ChangeLog
lisp/ChangeLog
+7
-0
lisp/gnus/ChangeLog
lisp/gnus/ChangeLog
+5
-0
lisp/gnus/nnimap.el
lisp/gnus/nnimap.el
+5
-1
lisp/net/tls.el
lisp/net/tls.el
+3
-4
No files found.
lisp/ChangeLog
View file @
aecb42aa
2010-10-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/tls.el (tls-starttls-switches): Give up on using starttls with
gnutls-cli.
(tls-program): Add --insecure to be consistent with the defaults from
openssl s_client. Now all three commands are insecure.
2010-10-01 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake)
...
...
lisp/gnus/ChangeLog
View file @
aecb42aa
2010-10-01 Lars Magne Ingebrigtsen <larsi@gnus.org>
* nnimap.el (nnimap-extend-tls-programs): Only extend those programs
for starttls that tls.el implements; i.e. openssl.
2010-10-01 Katsumi Yamaoka <yamaoka@jpl.org>
* gravatar.el: Don't load image.el that XEmacs doesn't provide.
...
...
lisp/gnus/nnimap.el
View file @
aecb42aa
...
...
@@ -404,7 +404,11 @@ textual parts.")
(
unless
(
consp
programs
)
(
setq
programs
(
list
programs
)))
(
dolist
(
program
programs
)
(
push
(
concat
program
" "
"%s"
)
result
))
(
when
(
assoc
(
car
(
split-string
program
))
tls-starttls-switches
)
(
push
(
if
(
not
(
string-match
"%s"
program
))
(
concat
program
" "
"%s"
)
program
)
result
)))
(
nreverse
result
)))
(
defun
nnimap-find-parameter
(
parameter
elems
)
...
...
lisp/net/tls.el
View file @
aecb42aa
...
...
@@ -76,12 +76,11 @@ and `gnutls-cli' (version 2.0.1) output."
:group
'tls
)
(
defvar
tls-starttls-switches
'
((
"gnutls-cli"
"-s"
)
(
"openssl"
"-starttls imap"
))
'
((
"openssl"
"-starttls imap"
))
"Alist of programs and the switches necessary to get starttls behaviour."
)
(
defcustom
tls-program
'
(
"gnutls-cli
%s
-p %p %h"
"gnutls-cli
%s
-p %p %h --protocols ssl3"
(
defcustom
tls-program
'
(
"gnutls-cli
--insecure
-p %p %h"
"gnutls-cli
--insecure
-p %p %h --protocols ssl3"
"openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof"
)
"List of strings containing commands to start TLS stream to a host.
Each entry in the list is tried until a connection is successful.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment