[Emacs-diffs] /srv/bzr/emacs/trunk r105481: (network-stream-open-starttls): Support using starttls.el without using gnutls-cli.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105481
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-17 22:50:33 +0200
message:
  (network-stream-open-starttls): Support using starttls.el without using 
gnutls-cli.
modified:
  lisp/ChangeLog
  lisp/net/network-stream.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-17 17:11:49 +0000
+++ b/lisp/ChangeLog    2011-08-17 20:50:33 +0000
@@ -1,3 +1,8 @@
+2011-08-17  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/network-stream.el (network-stream-open-starttls): Support
+       using starttls.el without using gnutls-cli.
+
 2011-08-17  Juri Linkov  <address@hidden>
 
        * progmodes/grep.el (rgrep): Handle the case when

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2011-08-04 00:58:07 +0000
+++ b/lisp/net/network-stream.el        2011-08-17 20:50:33 +0000
@@ -237,13 +237,13 @@
       (unless builtin-starttls
        (delete-process stream)
        (setq start (with-current-buffer buffer (point-max)))
-       (let* ((starttls-use-gnutls t)
-              (starttls-extra-arguments
+       (let* ((starttls-extra-arguments
                (if require-tls
                    starttls-extra-arguments
                  ;; For opportunistic TLS upgrades, we don't really
                  ;; care about the identity of the peer.
                  (cons "--insecure" starttls-extra-arguments)))
+              (starttls-extra-args starttls-extra-args)
               (cert (network-stream-certificate host service parameters)))
          ;; There are client certificates requested, so add them to
          ;; the command line.
@@ -251,7 +251,11 @@
            (setq starttls-extra-arguments
                  (nconc (list "--x509keyfile" (expand-file-name (nth 0 cert))
                               "--x509certfile" (expand-file-name (nth 1 cert)))
-                        starttls-extra-arguments)))
+                        starttls-extra-arguments)
+                 starttls-extra-args
+                 (nconc (list "--key-file" (expand-file-name (nth 0 cert))
+                              "--cert-file" (expand-file-name (nth 1 cert)))
+                        starttls-extra-args)))
          (setq stream (starttls-open-stream name buffer host service)))
        (network-stream-get-response stream start eoc)
        ;; Requery capabilities for protocols that require it; i.e.,