Skip to content

Commit

Permalink
irc: add support of SNI in SSL connection to IRC server (closes #620)
Browse files Browse the repository at this point in the history
  • Loading branch information
flashcode committed Dec 10, 2015
1 parent e6e8f34 commit 136da36
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 13 deletions.
1 change: 1 addition & 0 deletions ChangeLog.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* api: add argument "length" in function utf8_is_valid()
* alias: display completion in /alias list (issue #518)
* fifo: add /fifo command
* irc: add support of SNI in SSL connection to IRC server (issue #620)
* irc: use current channel and current server channels first in completions
"irc_server_channels" and "irc_channels" (task #12923, issue #392)
* irc: add support of "cap-notify" capability (issue #182, issue #477)
Expand Down
5 changes: 4 additions & 1 deletion po/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-02 19:26+0100\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -3947,6 +3947,9 @@ msgstr ""
"Pokud používá tento soubor jiný proces WeeChat, skuste WeeChat pustit\n"
"s jiným domovským adresářem pomocí \"--dir\" volby příkazové řádky.\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr "nekorektní priority"

Expand Down
5 changes: 4 additions & 1 deletion po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-03 20:51+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <>\n"
Expand Down Expand Up @@ -4682,6 +4682,9 @@ msgstr ""
"Aufruf der \"--dir\" Kommandozeilenoption, WeeChat mit einem anderen Home-"
"Verzeichnis zu starten.\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr "ungültige Priorität"

Expand Down
5 changes: 4 additions & 1 deletion po/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-02 19:26+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -4160,6 +4160,9 @@ msgstr ""
"con otro directorio de inicio usando la opción de línea de comandos \"--dir"
"\"\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr "prioridad inválida"

Expand Down
7 changes: 5 additions & 2 deletions po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"PO-Revision-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-10 07:12+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
Expand Down Expand Up @@ -4576,6 +4576,9 @@ msgstr ""
"un autre répertoire de base en utilisant l'option de ligne de commande \"--"
"dir\".\n"

msgid "set server name indication (SNI) failed"
msgstr "la définition de l'indication de nom de serveur (SNI) a échoué"

msgid "invalid priorities"
msgstr "priorités invalides"

Expand Down
5 changes: 4 additions & 1 deletion po/hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-02 19:26+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -3556,6 +3556,9 @@ msgstr ""
"Ha egy másik WeeChat folyamat használja ezt a fájlt, próbálja másik\n"
"saját könyvtárral futtatni a WeeChat-et a \"--dir\" opció segítségével!\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-02 19:26+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -4276,6 +4276,9 @@ msgstr ""
"Se un'altra istanza di WeeChat usa questo file, eseguire WeeChat\n"
"con un'altra home usando l'opzione da riga di comando \"--dir\".\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr "priorità non valide"

Expand Down
5 changes: 4 additions & 1 deletion po/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-02 19:26+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
Expand Down Expand Up @@ -4379,6 +4379,9 @@ msgstr ""
"他の WeeChat プロセスがこのファイルを使用している場合は、\n"
"\"--dir\" コマンドラインオプションをつけて WeeChat を起動してみてください。\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr "無効なプロパティ"

Expand Down
5 changes: 4 additions & 1 deletion po/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-02 19:26+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -4482,6 +4482,9 @@ msgstr ""
"Jeżeli inny proces WeeChat używa tego pliku, spróbuj uruchomić WeeChat\n"
"w innym katalogu domowym używając w linii komend opcji \"--dir\".\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr "nieprawidłowe priorytety"

Expand Down
5 changes: 4 additions & 1 deletion po/pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-09-30 20:56+0200\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -4151,6 +4151,9 @@ msgid ""
"with another home using \"--dir\" command line option.\n"
msgstr ""

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion po/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-12-02 19:26+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -3586,6 +3586,9 @@ msgstr ""
"WeeChat\n"
"с другой домашней директорией используя параметр \"--dir\".\n"

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion po/tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2015-03-10 21:33+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -3200,6 +3200,9 @@ msgid ""
"with another home using \"--dir\" command line option.\n"
msgstr ""

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr ""

Expand Down
5 changes: 4 additions & 1 deletion po/weechat.pot
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-12-10 06:57+0100\n"
"POT-Creation-Date: 2015-12-10 07:09+0100\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
Expand Down Expand Up @@ -3194,6 +3194,9 @@ msgid ""
"with another home using \"--dir\" command line option.\n"
msgstr ""

msgid "set server name indication (SNI) failed"
msgstr ""

msgid "invalid priorities"
msgstr ""

Expand Down
13 changes: 13 additions & 0 deletions src/core/wee-network.c
Original file line number Diff line number Diff line change
Expand Up @@ -1634,6 +1634,19 @@ network_connect_with_fork (struct t_hook *hook_connect)
unhook (hook_connect);
return;
}
rc = gnutls_server_name_set (*HOOK_CONNECT(hook_connect, gnutls_sess),
GNUTLS_NAME_DNS,
HOOK_CONNECT(hook_connect, address),
strlen (HOOK_CONNECT(hook_connect, address)));
if (rc != GNUTLS_E_SUCCESS)
{
(void) (HOOK_CONNECT(hook_connect, callback))
(hook_connect->callback_data,
WEECHAT_HOOK_CONNECT_GNUTLS_INIT_ERROR,
0, -1, _("set server name indication (SNI) failed"), NULL);
unhook (hook_connect);
return;
}
rc = gnutls_priority_set_direct (*HOOK_CONNECT(hook_connect, gnutls_sess),
HOOK_CONNECT(hook_connect, gnutls_priorities),
&pos_error);
Expand Down

0 comments on commit 136da36

Please sign in to comment.