Richard Stallman <rms gnu.org> writes:
> Simon, would you please add comments near the code in
GNUtls that
> outputs these messages, telling people to watch out for
the need for
> Emacs to detect the last part of the messages?
Done, the GnuTLS code now contains:
/* Warning! Do not touch this text string, it is used by
external
programs to search for when gnutls-cli has reached this
point. */
printf ("n- Simple Client Mode:nn");
etc
> + ;; `gnutls` regexp
> + (sequence
> + ;; see src/cli.c lines 721--
> + (sequence line-start "- Simple Client
Mode:n")
> + (zero-or-more
> + (or
> + "n" ; ignore blank lines
> + ;; XXX: we have no way of knowing if the
STARTTLS handshake
> + ;; sequence has completed successfully, because
`gnutls` will
> + ;; only report failure.
> + (sequence line-start "*** Starting TLS
handshaken"))))))
I also installed the following patch, because I think the
above comment
was incorrect.
/Simon
Index: lisp/ChangeLog
============================================================
=======
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12157
diff -u -p -r1.12157 ChangeLog
--- lisp/ChangeLog 5 Nov 2007 09:06:25 -0000 1.12157
+++ lisp/ChangeLog 5 Nov 2007 10:25:21 -0000
 -1,3
+1,7 
+2007-11-05 Simon Josefsson <simon josefsson.org>
+
+ * net/tls.el (tls-end-of-info): Doc fix.
+
2007-11-05 Kenichi Handa <handa ni.aist.go.jp>
* international/utf-7.el (utf-7-imap): New coding system.
Index: lisp/net/tls.el
============================================================
=======
RCS file: /sources/emacs/emacs/lisp/net/tls.el,v
retrieving revision 1.21
diff -u -p -r1.21 tls.el
--- lisp/net/tls.el 4 Nov 2007 01:25:49 -0000 1.21
+++ lisp/net/tls.el 5 Nov 2007 10:25:21 -0000
 -65,9
+65,9 
;; `gnutls' regexp. See src/cli.c lines 721-.
"^- Simple Client Mode:n"
"\(n\|" ; ignore
blank lines
- ;; XXX: We have no way of knowing if the STARTTLS
handshake sequence
- ;; has completed successfully, because `gnutls' will
only report
- ;; failure.
+ ;; According to src/cli.c lines 640-650 and 705-715 the
handshake
+ ;; will start after this message. If the handshake
fails, the
+ ;; programs will abort.
"^\*\*\* Starting TLS handshaken\)*"
"\)")
"Regexp matching end of TLS client informational
messages.
_______________________________________________
Emacs-devel mailing list
Emacs-devel gnu.org
htt
p://lists.gnu.org/mailman/listinfo/emacs-devel
|