Re: Merge issues in `tls.el' (EMACS_22_BASE vs. trunk)

[Glenn Morris]

Reiner Steib wrote:

> it seems that something went wrong when syncing Emacs_22 and the trunk
> in `tls.el':

No, something went wrong syncing gnus trunk to emacs trunk. :)
Anyway, well spotted.

> - EMACS_22_BASE should not use `rx'.  (The log of revision 1.27 says
>   "Revert merge that re-required rx.").

There's no problem there.

> - In the trunk, `tls-end-of-info' is defcustomed, but not used at all.
>   It is used in `open-tls-stream' in EMACS_22_BASE.

The 2007-12-05 changes of Elias Oltmanns to open-tls-stream seem to
have clobbered the 2007-11-04 changes of Riccardo Murri. Does this
patch look ok?

*** tls.el.~1.30.~      2008-02-28 20:00:45.000000000 -0800
--- tls.el      2008-03-01 15:35:48.000000000 -0800
***************
*** 244,259 ****
              (sit-for 1)))
          (message "Opening TLS connection with `%s'...%s" cmd
                   (if done "done" "failed"))
!         (if done
!             (setq done process)
!           (delete-process process))))
!       (when done
        (save-excursion
!         (set-buffer buffer)
!         (when
              (or
               (and tls-checktrust
!                   (progn
                      (goto-char (point-min))
                      (re-search-forward tls-untrusted nil t))
                    (or
--- 244,272 ----
              (sit-for 1)))
          (message "Opening TLS connection with `%s'...%s" cmd
                   (if done "done" "failed"))
!         (if (not done)
!             (delete-process process)
!           ;; advance point to after all informational messages that
!           ;; `openssl s_client' and `gnutls' print
!           (let ((start-of-data nil))
!             (while
!                  (not (setq start-of-data
!                             ;; the string matching `tls-end-of-info'
!                             ;; might come in separate chunks from
!                             ;; `accept-process-output', so start the
!                             ;; search where `tls-success' ended
                              (save-excursion
!                               (if (re-search-forward tls-end-of-info nil t)
!                                   (match-end 0)))))
!               (accept-process-output process 1))
!             (if start-of-data
!                 ;; move point to start of client data
!                 (goto-char start-of-data)))
!         (setq done process))))
!       (when (and done
                 (or
                  (and tls-checktrust
!                      (save-excursion
                         (goto-char (point-min))
                         (re-search-forward tls-untrusted nil t))
                       (or
***************
*** 262,276 ****
                     (not (yes-or-no-p
                           (format "The certificate presented by `%s' is NOT 
trusted. Accept anyway? " host)))))
               (and tls-hostmismatch
!                   (progn
                      (goto-char (point-min))
                      (re-search-forward tls-hostmismatch nil t))
                    (not (yes-or-no-p
!                         (format "Host name in certificate doesn't match `%s'. 
Connect anyway? " host)))))
            (setq done nil)
!           (delete-process process))))
        (message "Opening TLS connection to `%s'...%s"
!              host (if done "done" "failed")))
      (when use-temp-buffer
        (if done (set-process-buffer process nil))
        (kill-buffer buffer))
--- 275,289 ----
                        (not (yes-or-no-p
                              (format "The certificate presented by `%s' is NOT 
trusted. Accept anyway? " host)))))
                  (and tls-hostmismatch
!                      (save-excursion
                         (goto-char (point-min))
                         (re-search-forward tls-hostmismatch nil t))
                       (not (yes-or-no-p
!                            (format "Host name in certificate doesn't match 
`%s'. Connect anyway? " host))))))
        (setq done nil)
!       (delete-process process)))
      (message "Opening TLS connection to `%s'...%s"
!            host (if done "done" "failed"))
      (when use-temp-buffer
        (if done (set-process-buffer process nil))
        (kill-buffer buffer))