procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(network-stream-certificate): Change cert-cert to cert and cert-key to key.

Browse source
This commit is contained in:
Lars Magne Ingebrigtsen 2011-06-21 23:00:45 +02:00
parent 6a6e4d9309
commit eb8c936238
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -5,6 +5,8 @@
STARTTLS.
(auth-source): Require.
(open-network-stream): Document the :client-certificate keyword.
(network-stream-certificate): Change cert-cert to cert and
cert-key to key.
2011-06-21 Michael Albinus <michael.albinus@gmx.de>

8
lisp/net/network-stream.el
View file

@ -171,8 +171,8 @@ values:
(car (auth-source-search :max 1
:host host
:port service)))
(key (plist-get auth-info :cert-key))
(cert (plist-get auth-info :cert-cert)))
(key (plist-get auth-info :key))
(cert (plist-get auth-info :cert)))
(and key cert
(list key cert)))))))
@ -231,8 +231,8 @@ values:
;; the command line.
(when cert
(setq starttls-extra-arguments
(nconc (list "--x509keyfile" (nth 0 cert)
"--x509certfile" (nth 1 cert))
(nconc (list "--x509keyfile" (expand-file-name (nth 0 cert))
"--x509certfile" (expand-file-name (nth 1 cert)))
starttls-extra-arguments)))
(setq stream (starttls-open-stream name buffer host service)))
(network-stream-get-response stream start eoc))