From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 21 Jun 2011 21:00:45 +0000 (+0200)
Subject: (network-stream-certificate): Change cert-cert to cert and cert-key to key.
X-Git-Tag: emacs-pretest-24.0.90~104^2~483
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb8c936238e238ce4ce9f78d909657491f625095;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78af1aa3ca1..44822b5ba43 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 
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))