emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(irc): remove obsolete tls.el workaround

Browse source 
Circe dropped its dependency on tls.el for gnutls.

Ref: emacs-circe/circe#377
Ref: emacs-circe/circe#340
Ref: emacs-circe/circe@a71d55d6b8
Ref: #1862
Close: #7959
Co-authored-by: Thaodan <Thaodan@users.noreply.github.com>
This commit is contained in:
Henrik Lissner 2024-07-23 13:13:42 -04:00
parent f5b3958331
commit 2f2c294529
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/app/irc/config.el
View file

@ -94,25 +94,6 @@ playback.")
(add-hook 'circe-mode-hook #'+irc--add-circe-buffer-to-persp-h) (add-hook 'circe-mode-hook #'+irc--add-circe-buffer-to-persp-h)
(add-hook 'circe-mode-hook #'turn-off-smartparens-mode) (add-hook 'circe-mode-hook #'turn-off-smartparens-mode)
;; HACK Fix #1862: circe hangs on TLS connections when using OpenSSL versions
;; > 1.1.0, where tls.el does not correctly determine the end of the info
;; block. This fixes proposed in jorgenschaefer/circe#340
(setq-hook! 'circe-mode-hook
tls-end-of-info
(concat "\\("
;; `openssl s_client' regexp. See ssl/ssl_txt.c lines 219-220.
;; According to apps/s_client.c line 1515 `---' is always the last
;; line that is printed by s_client before the real data.
"^ Verify return code: .+\n\\(\\|^ Extended master secret: .+\n\\)\\(\\|^ Max Early Data: .+\n\\)---\n\\|"
;; `gnutls' regexp. See src/cli.c lines 721-.
"^- Simple Client Mode:\n"
"\\(\n\\|" ; ignore blank lines
;; According to GnuTLS v2.1.5 src/cli.c lines 640-650 and 705-715 in
;; `main' the handshake will start after this message. If the
;; handshake fails, the programs will abort.
"^\\*\\*\\* Starting TLS handshake\n\\)*"
"\\)"))
(defadvice! +irc--circe-run-disconnect-hook-a (&rest _) (defadvice! +irc--circe-run-disconnect-hook-a (&rest _)
"Runs `+irc-disconnect-hook' after circe disconnects." "Runs `+irc-disconnect-hook' after circe disconnects."
:after #'circe--irc-conn-disconnected :after #'circe--irc-conn-disconnected