Re: [PATCH] GnuTLS support on Woe32

[Ted Zlatanov <tzz@lifelogs.com>]

[-- Attachment #1: Type: text/plain, Size: 826 bytes --]

On Tue, 22 Mar 2011 18:12:11 +0100 Robert Pluim <rpluim@gmail.com> wrote: 

RP> Ted Zlatanov <tzz@lifelogs.com> writes:
>> On Tue, 22 Mar 2011 17:19:22 +0100 Robert Pluim <rpluim@gmail.com> wrote: 
>> 
RP> Ted Zlatanov <tzz@lifelogs.com> writes:
>>>> I've attached an updated patch.  Sorry if I have missed anything.  It
>>>> would be nice to have an automatic way to catch these formatting issues.
>> 
RP> Does gnus require a change as well?
>> 
>> Yes, it will have to set the `gnutls-hostname'.  This should be
>> transparent to the user, probably in proto-stream.el.  I can look at it
>> once the patch is approved.

RP> Well, gnus is my testcase for TLS, so I can't weigh in on that at all :)

Try the attached patch against proto-stream.el in the Emacs trunk.  I'll
refresh my patch to add this change too.

Thanks
Ted


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: callbacks-proto.patch --]
[-- Type: text/x-diff, Size: 1141 bytes --]

=== modified file 'lisp/gnus/proto-stream.el'
--- lisp/gnus/proto-stream.el	2011-02-06 22:27:28 +0000
+++ lisp/gnus/proto-stream.el	2011-03-22 17:55:28 +0000
@@ -61,7 +61,8 @@
   :group 'comm)
 
 (declare-function gnutls-negotiate "gnutls"
-		  (proc type &optional priority-string trustfiles keyfiles))
+		  (proc type &optional priority-string trustfiles keyfiles
+                        verify-flags verify-error verify-hostname-error))
 
 ;;;###autoload
 (defun open-protocol-stream (name buffer host service &rest parameters)
@@ -190,7 +191,12 @@
 		  (list stream greeting capabilities 'network)))
 	    ;; The server said it was OK to start doing STARTTLS negotiations.
 	    (if (fboundp 'open-gnutls-stream)
-		(gnutls-negotiate stream nil)
+                (progn
+                  ;; Set the required buffer-local gnutls-hostname
+                  ;; (defined in gnutls.el).
+                  (with-current-buffer buffer
+                    (set (intern "gnutls-hostname") host))
+                  (gnutls-negotiate stream nil))
 	      (unless (starttls-negotiate stream)
 		(delete-process stream)
 		(setq stream nil)))