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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78af1aa3ca115d686f936b8e2cfa276ec71cff24..44822b5ba439d302a0939b6cda55dc1db30f10a8 100644 (file)
--- 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 9c4ca80104d45d797f6e87f92b7c13ffe790b53f..b75621beee4d4f463ca12bb294859f2699d184e4 100644 (file)
--- 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))