[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104664: (network-stream-certificate)
From: |
Lars Magne Ingebrigtsen |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104664: (network-stream-certificate): Change cert-cert to cert and cert-key to key. |
Date: |
Tue, 21 Jun 2011 23:00:45 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104664
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2011-06-21 23:00:45 +0200
message:
(network-stream-certificate): Change cert-cert to cert and cert-key to key.
modified:
lisp/ChangeLog
lisp/net/network-stream.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-21 20:39:08 +0000
+++ b/lisp/ChangeLog 2011-06-21 21:00:45 +0000
@@ -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 <address@hidden>
=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el 2011-06-21 20:39:08 +0000
+++ b/lisp/net/network-stream.el 2011-06-21 21:00:45 +0000
@@ -171,8 +171,8 @@
(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 @@
;; 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104664: (network-stream-certificate): Change cert-cert to cert and cert-key to key.,
Lars Magne Ingebrigtsen <=