From 2f2c2945291edfeae84e4c77fe214c0576a982b1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 23 Jul 2024 13:13:42 -0400 Subject: [PATCH] refactor(irc): remove obsolete tls.el workaround Circe dropped its dependency on tls.el for gnutls. Ref: emacs-circe/circe#377 Ref: emacs-circe/circe#340 Ref: emacs-circe/circe@a71d55d6b87f Ref: #1862 Close: #7959 Co-authored-by: Thaodan --- modules/app/irc/config.el | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/modules/app/irc/config.el b/modules/app/irc/config.el index 35133b887..a5d3b0a15 100644 --- a/modules/app/irc/config.el +++ b/modules/app/irc/config.el @@ -94,25 +94,6 @@ playback.") (add-hook 'circe-mode-hook #'+irc--add-circe-buffer-to-persp-h) (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 _) "Runs `+irc-disconnect-hook' after circe disconnects." :after #'circe--irc-conn-disconnected