diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 10da44be8..d48114cfc 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -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) diff --git a/po/cs.po b/po/cs.po index c980d3095..a9d63e5b5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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" diff --git a/po/de.po b/po/de.po index 30e790281..9c32d0c93 100644 --- a/po/de.po +++ b/po/de.po @@ -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 \n" "Language-Team: German <>\n" @@ -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" diff --git a/po/es.po b/po/es.po index c7f20d0ea..affae87f4 100644 --- a/po/es.po +++ b/po/es.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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" diff --git a/po/fr.po b/po/fr.po index 114fb7a67..c5648d934 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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 \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -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" diff --git a/po/hu.po b/po/hu.po index 386fffa5b..cadf3c7bf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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 "" diff --git a/po/it.po b/po/it.po index d756010ed..de672ff81 100644 --- a/po/it.po +++ b/po/it.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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" diff --git a/po/ja.po b/po/ja.po index 906606c19..74af53992 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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 \n" "Language-Team: Japanese \n" @@ -4379,6 +4379,9 @@ msgstr "" "他の WeeChat プロセスがこのファイルを使用している場合は、\n" "\"--dir\" コマンドラインオプションをつけて WeeChat を起動してみてください。\n" +msgid "set server name indication (SNI) failed" +msgstr "" + msgid "invalid priorities" msgstr "無効なプロパティ" diff --git a/po/pl.po b/po/pl.po index 9c91a1fc0..26e3e7899 100644 --- a/po/pl.po +++ b/po/pl.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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" diff --git a/po/pt_BR.po b/po/pt_BR.po index 98e6f53fc..16fd7c1d4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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 "" diff --git a/po/ru.po b/po/ru.po index 219348349..179da4165 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -3586,6 +3586,9 @@ msgstr "" "WeeChat\n" "с другой домашней директорией используя параметр \"--dir\".\n" +msgid "set server name indication (SNI) failed" +msgstr "" + msgid "invalid priorities" msgstr "" diff --git a/po/tr.po b/po/tr.po index 8b29c2829..7d2e04c21 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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 "" diff --git a/po/weechat.pot b/po/weechat.pot index b5aa9d37d..ab85446dd 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -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 \n" "Language-Team: weechat-dev \n" @@ -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 "" diff --git a/src/core/wee-network.c b/src/core/wee-network.c index 7eb94ca49..c5f19e34d 100644 --- a/src/core/wee-network.c +++ b/src/core/wee-network.c @@ -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);