Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
57173b96
Commit
57173b96
authored
Aug 17, 2011
by
Lars Magne Ingebrigtsen
Browse files
(network-stream-open-starttls): Support using starttls.el without using gnutls-cli.
parent
02b404de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/net/network-stream.el
lisp/net/network-stream.el
+7
-3
No files found.
lisp/ChangeLog
View file @
57173b96
2011-08-17 Lars Magne Ingebrigtsen <larsi@gnus.org>
* net/network-stream.el (network-stream-open-starttls): Support
using starttls.el without using gnutls-cli.
2011-08-17 Juri Linkov <juri@jurta.org>
* progmodes/grep.el (rgrep): Handle the case when
...
...
lisp/net/network-stream.el
View file @
57173b96
...
...
@@ -237,13 +237,13 @@ functionality.
(
unless
builtin-starttls
(
delete-process
stream
)
(
setq
start
(
with-current-buffer
buffer
(
point-max
)))
(
let*
((
starttls-use-gnutls
t
)
(
starttls-extra-arguments
(
let*
((
starttls-extra-arguments
(
if
require-tls
starttls-extra-arguments
;; For opportunistic TLS upgrades, we don't really
;; care about the identity of the peer.
(
cons
"--insecure"
starttls-extra-arguments
)))
(
starttls-extra-args
starttls-extra-args
)
(
cert
(
network-stream-certificate
host
service
parameters
)))
;; There are client certificates requested, so add them to
;; the command line.
...
...
@@ -251,7 +251,11 @@ functionality.
(
setq
starttls-extra-arguments
(
nconc
(
list
"--x509keyfile"
(
expand-file-name
(
nth
0
cert
))
"--x509certfile"
(
expand-file-name
(
nth
1
cert
)))
starttls-extra-arguments
)))
starttls-extra-arguments
)
starttls-extra-args
(
nconc
(
list
"--key-file"
(
expand-file-name
(
nth
0
cert
))
"--cert-file"
(
expand-file-name
(
nth
1
cert
)))
starttls-extra-args
)))
(
setq
stream
(
starttls-open-stream
name
buffer
host
service
)))
(
network-stream-get-response
stream
start
eoc
)
;; Requery capabilities for protocols that require it; i.e.,
...
...
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