diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-21 23:00:45 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-21 23:00:45 +0200 |
| commit | eb8c936238e238ce4ce9f78d909657491f625095 (patch) | |
| tree | fd9e3ee3e610426e4a24bcd4953f650caf56092a /lisp/net | |
| parent | 6a6e4d9309bb0f94fbde68f3c3dd2ce275eaf107 (diff) | |
| download | emacs-eb8c936238e238ce4ce9f78d909657491f625095.tar.gz | |
(network-stream-certificate): Change cert-cert to cert and cert-key to key.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/network-stream.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 9c4ca80104d..b75621beee4 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -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)) |