diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | doc/de/autogen/user/irc_options.adoc | 2 | ||||
| -rw-r--r-- | doc/en/autogen/user/irc_options.adoc | 2 | ||||
| -rw-r--r-- | doc/fr/autogen/user/irc_options.adoc | 2 | ||||
| -rw-r--r-- | doc/it/autogen/user/irc_options.adoc | 2 | ||||
| -rw-r--r-- | doc/ja/autogen/user/irc_options.adoc | 2 | ||||
| -rw-r--r-- | doc/pl/autogen/user/irc_options.adoc | 2 | ||||
| -rw-r--r-- | po/cs.po | 6 | ||||
| -rw-r--r-- | po/de.po | 22 | ||||
| -rw-r--r-- | po/es.po | 6 | ||||
| -rw-r--r-- | po/fr.po | 12 | ||||
| -rw-r--r-- | po/hu.po | 6 | ||||
| -rw-r--r-- | po/it.po | 6 | ||||
| -rw-r--r-- | po/ja.po | 12 | ||||
| -rw-r--r-- | po/pl.po | 12 | ||||
| -rw-r--r-- | po/pt.po | 16 | ||||
| -rw-r--r-- | po/pt_BR.po | 6 | ||||
| -rw-r--r-- | po/ru.po | 6 | ||||
| -rw-r--r-- | po/tr.po | 6 | ||||
| -rw-r--r-- | po/weechat.pot | 6 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.c | 4 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 4 |
22 files changed, 68 insertions, 75 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index ab3bc8fd6..b9adba49b 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -33,6 +33,7 @@ Bug fixes:: * core: set max length to 4096 for /secure passphrase (issue #1323) * core: refilter only affected buffers on filter change (issue #1309, issue #1311) * fset: fix slow refresh of fset buffer during /reload (issue #1313) + * irc: fix length of string for SHA-512, SHA-256 and SHA-1 in help on ssl_fingerprint option * irc: display an error with /allchan -current or /allpv -current if the current buffer is not an irc buffer (issue #1325) * irc: fix update of channels modes with arguments when joining a channel (issue #1324) * irc: quote NICK command argument sent to the server (issue #1319) diff --git a/doc/de/autogen/user/irc_options.adoc b/doc/de/autogen/user/irc_options.adoc index 9d752bb73..0668ede11 100644 --- a/doc/de/autogen/user/irc_options.adoc +++ b/doc/de/autogen/user/irc_options.adoc @@ -741,7 +741,7 @@ ** Standardwert: `+2048+` * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint* -** Beschreibung: pass:none[Fingerprint des Zertifikates welches als vertrauenswürdig eingestuft und für diesen Server akzeptiert wird; es sind nur hexadezimale Zeichen erlaubt (0-9, a-f): bei SHA-512 ist das Zertifikat 64 Zeichen lang, bei SHA-256 sind es 32 Zeichen, bei SHA-1 sind es 20 Zeichen (nicht empfohlen, da unsicher); mehrere Fingerprints können durch Kommata voneinander getrennt werden; wird diese Option genutzt, findet KEINE weitere Überprüfung der Zertifikate statt (Option "ssl_verify") (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)] +** Beschreibung: pass:none[Fingerprint des Zertifikates welches als vertrauenswürdig eingestuft und für diesen Server akzeptiert wird; es sind nur hexadezimale Zeichen erlaubt (0-9, a-f): bei SHA-512 ist das Zertifikat 128 Zeichen lang, bei SHA-256 sind es 64 Zeichen, bei SHA-1 sind es 40 Zeichen (nicht empfohlen, da unsicher); mehrere Fingerprints können durch Kommata voneinander getrennt werden; wird diese Option genutzt, findet KEINE weitere Überprüfung der Zertifikate statt (Option "ssl_verify") (Hinweis: Inhalt wird evaluiert, siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird durch den eigentlichen Servernamen ersetzt)] ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette ** Standardwert: `+""+` diff --git a/doc/en/autogen/user/irc_options.adoc b/doc/en/autogen/user/irc_options.adoc index 5ecfb2802..ead67d226 100644 --- a/doc/en/autogen/user/irc_options.adoc +++ b/doc/en/autogen/user/irc_options.adoc @@ -741,7 +741,7 @@ ** default value: `+2048+` * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint* -** description: pass:none[fingerprint of certificate which is trusted and accepted for the server; only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many fingerprints can be separated by commas; if this option is set, the other checks on certificates are NOT performed (option "ssl_verify") (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)] +** description: pass:none[fingerprint of certificate which is trusted and accepted for the server; only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many fingerprints can be separated by commas; if this option is set, the other checks on certificates are NOT performed (option "ssl_verify") (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)] ** type: string ** values: any string ** default value: `+""+` diff --git a/doc/fr/autogen/user/irc_options.adoc b/doc/fr/autogen/user/irc_options.adoc index baa553219..a01f4a41f 100644 --- a/doc/fr/autogen/user/irc_options.adoc +++ b/doc/fr/autogen/user/irc_options.adoc @@ -741,7 +741,7 @@ ** valeur par défaut: `+2048+` * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint* -** description: pass:none[empreinte du certificat qui est de confiance et accepté pour le serveur ; seuls les chiffres hexadécimaux sont autorisés (0-9, a-f) : 64 caractères pour SHA-512, 32 caractères pour SHA-256, 20 caractères pour SHA-1 (non sûr, non recommandé) ; plusieurs empreintes peuvent être séparées par des virgules ; si cette option est définie, les autres vérifications sur les certificats ne sont PAS effectuées (option "ssl_verify") (note : le contenu est évalué, voir /help eval ; les options de serveur sont évaluées avec ${irc_server.xxx} et ${server} est remplacé par le nom du serveur)] +** description: pass:none[empreinte du certificat qui est de confiance et accepté pour le serveur ; seuls les chiffres hexadécimaux sont autorisés (0-9, a-f) : 128 caractères pour SHA-512, 64 caractères pour SHA-256, 40 caractères pour SHA-1 (non sûr, non recommandé) ; plusieurs empreintes peuvent être séparées par des virgules ; si cette option est définie, les autres vérifications sur les certificats ne sont PAS effectuées (option "ssl_verify") (note : le contenu est évalué, voir /help eval ; les options de serveur sont évaluées avec ${irc_server.xxx} et ${server} est remplacé par le nom du serveur)] ** type: chaîne ** valeurs: toute chaîne ** valeur par défaut: `+""+` diff --git a/doc/it/autogen/user/irc_options.adoc b/doc/it/autogen/user/irc_options.adoc index fbee5ed3f..a0f54b0b3 100644 --- a/doc/it/autogen/user/irc_options.adoc +++ b/doc/it/autogen/user/irc_options.adoc @@ -741,7 +741,7 @@ ** valore predefinito: `+2048+` * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint* -** descrizione: pass:none[fingerprint of certificate which is trusted and accepted for the server; only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many fingerprints can be separated by commas; if this option is set, the other checks on certificates are NOT performed (option "ssl_verify") (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)] +** descrizione: pass:none[fingerprint of certificate which is trusted and accepted for the server; only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many fingerprints can be separated by commas; if this option is set, the other checks on certificates are NOT performed (option "ssl_verify") (note: content is evaluated, see /help eval; server options are evaluated with ${irc_server.xxx} and ${server} is replaced by the server name)] ** tipo: stringa ** valori: qualsiasi stringa ** valore predefinito: `+""+` diff --git a/doc/ja/autogen/user/irc_options.adoc b/doc/ja/autogen/user/irc_options.adoc index 237258e6e..afb8cb037 100644 --- a/doc/ja/autogen/user/irc_options.adoc +++ b/doc/ja/autogen/user/irc_options.adoc @@ -741,7 +741,7 @@ ** デフォルト値: `+2048+` * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint* -** 説明: pass:none[信頼でき、通信を認めるサーバ証明書の指紋; 16 進数で使える文字 (0-9, a-f) 以外は指定できません: SHA-512 の場合 64 文字、SHA-256 の場合 32 文字、SHA-1 の場合 20 文字 (危険、非推奨) です。複数の指紋を設定する場合はコンマで区切ってください; このオプションを設定した場合、証明書に対する他の妥当性確認は行われません (オプション "ssl_verify") (注意: 値は評価されます、/help eval を参照してください; ここで ${irc_server.xxx} はサーバオプション、${server} はサーバ名を意味します)] +** 説明: pass:none[信頼でき、通信を認めるサーバ証明書の指紋; 16 進数で使える文字 (0-9, a-f) 以外は指定できません: SHA-512 の場合 128 文字、SHA-256 の場合 64 文字、SHA-1 の場合 40 文字 (危険、非推奨) です。複数の指紋を設定する場合はコンマで区切ってください; このオプションを設定した場合、証明書に対する他の妥当性確認は行われません (オプション "ssl_verify") (注意: 値は評価されます、/help eval を参照してください; ここで ${irc_server.xxx} はサーバオプション、${server} はサーバ名を意味します)] ** タイプ: 文字列 ** 値: 未制約文字列 ** デフォルト値: `+""+` diff --git a/doc/pl/autogen/user/irc_options.adoc b/doc/pl/autogen/user/irc_options.adoc index c8a716d4f..70fda3234 100644 --- a/doc/pl/autogen/user/irc_options.adoc +++ b/doc/pl/autogen/user/irc_options.adoc @@ -741,7 +741,7 @@ ** domyślna wartość: `+2048+` * [[option_irc.server_default.ssl_fingerprint]] *irc.server_default.ssl_fingerprint* -** opis: pass:none[skrót certyfikatu, który jest zaufany i akceptowany dla serwera; tylko cyfry heksadecymalne są dozwolone (0-9, a-f): 64 znaki dla SHA-512, 32 znaki dla SHA-256, 20 znaków dla SHA-1 (mało bezpieczne, nie zalecane); wiele skrótów można oddzielić przecinkami; jeśli ta opcja jest ustawiona, certyfikat NIE jest dalej sprawdzany (opcja "ssl_verify") (uwaga: zawartość jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)] +** opis: pass:none[skrót certyfikatu, który jest zaufany i akceptowany dla serwera; tylko cyfry heksadecymalne są dozwolone (0-9, a-f): 128 znaki dla SHA-512, 64 znaki dla SHA-256, 40 znaków dla SHA-1 (mało bezpieczne, nie zalecane); wiele skrótów można oddzielić przecinkami; jeśli ta opcja jest ustawiona, certyfikat NIE jest dalej sprawdzany (opcja "ssl_verify") (uwaga: zawartość jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)] ** typ: ciąg ** wartości: dowolny ciąg ** domyślna wartość: `+""+` @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" "PO-Revision-Date: 2019-03-17 18:32+0100\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7840,8 +7840,8 @@ msgstr "velikost klíče použitého při použití výměny klíčů Diffie Hel msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" -"PO-Revision-Date: 2019-03-19 23:17+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" +"PO-Revision-Date: 2019-03-21 23:31+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" "Language: de\n" @@ -9372,8 +9372,8 @@ msgstr "" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " @@ -9381,13 +9381,13 @@ msgid "" msgstr "" "Fingerprint des Zertifikates welches als vertrauenswürdig eingestuft und für " "diesen Server akzeptiert wird; es sind nur hexadezimale Zeichen erlaubt " -"(0-9, a-f): bei SHA-512 ist das Zertifikat 64 Zeichen lang, bei SHA-256 sind " -"es 32 Zeichen, bei SHA-1 sind es 20 Zeichen (nicht empfohlen, da unsicher); " -"mehrere Fingerprints können durch Kommata voneinander getrennt werden; wird " -"diese Option genutzt, findet KEINE weitere Überprüfung der Zertifikate statt " -"(Option \"ssl_verify\") (Hinweis: Inhalt wird evaluiert, siehe /help eval; " -"Serveroptionen sind mittels ${irc_server.xxx} evaluiert und ${server} wird " -"durch den eigentlichen Servernamen ersetzt)" +"(0-9, a-f): bei SHA-512 ist das Zertifikat 128 Zeichen lang, bei SHA-256 " +"sind es 64 Zeichen, bei SHA-1 sind es 40 Zeichen (nicht empfohlen, da " +"unsicher); mehrere Fingerprints können durch Kommata voneinander getrennt " +"werden; wird diese Option genutzt, findet KEINE weitere Überprüfung der " +"Zertifikate statt (Option \"ssl_verify\") (Hinweis: Inhalt wird evaluiert, " +"siehe /help eval; Serveroptionen sind mittels ${irc_server.xxx} evaluiert " +"und ${server} wird durch den eigentlichen Servernamen ersetzt)" msgid "check that the SSL connection is fully trusted" msgstr "überprüft ob die SSL-Verbindung vertrauenswürdig ist" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" "PO-Revision-Date: 2019-03-17 16:04+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8086,8 +8086,8 @@ msgstr "tamaño de la llave usada durante Diffie-Hellman Key Exchange" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" -"PO-Revision-Date: 2019-03-19 20:35+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" +"PO-Revision-Date: 2019-03-21 23:31+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -9183,16 +9183,16 @@ msgstr "taille de clé utilisée pour l'échange de clé Diffie-Hellman" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " "${irc_server.xxx} and ${server} is replaced by the server name)" msgstr "" "empreinte du certificat qui est de confiance et accepté pour le serveur ; " -"seuls les chiffres hexadécimaux sont autorisés (0-9, a-f) : 64 caractères " -"pour SHA-512, 32 caractères pour SHA-256, 20 caractères pour SHA-1 (non sûr, " +"seuls les chiffres hexadécimaux sont autorisés (0-9, a-f) : 128 caractères " +"pour SHA-512, 64 caractères pour SHA-256, 40 caractères pour SHA-1 (non sûr, " "non recommandé) ; plusieurs empreintes peuvent être séparées par des " "virgules ; si cette option est définie, les autres vérifications sur les " "certificats ne sont PAS effectuées (option \"ssl_verify\") (note : le " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" "PO-Revision-Date: 2019-02-28 20:18+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7287,8 +7287,8 @@ msgstr "" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" "PO-Revision-Date: 2019-03-17 16:04+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8263,8 +8263,8 @@ msgstr "dimensione della chiave usata durante lo Scambio Chiavi Diffie-Hellman" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" -"PO-Revision-Date: 2019-03-11 21:10+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" +"PO-Revision-Date: 2019-03-21 23:32+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" "translation/ja_JP>\n" @@ -8831,16 +8831,16 @@ msgstr "Diffie-Hellman 鍵交換で使われる鍵長" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " "${irc_server.xxx} and ${server} is replaced by the server name)" msgstr "" "信頼でき、通信を認めるサーバ証明書の指紋; 16 進数で使える文字 (0-9, a-f) 以外" -"は指定できません: SHA-512 の場合 64 文字、SHA-256 の場合 32 文字、SHA-1 の場" -"合 20 文字 (危険、非推奨) です。複数の指紋を設定する場合はコンマで区切ってく" +"は指定できません: SHA-512 の場合 128 文字、SHA-256 の場合 64 文字、SHA-1 の場" +"合 40 文字 (危険、非推奨) です。複数の指紋を設定する場合はコンマで区切ってく" "ださい; このオプションを設定した場合、証明書に対する他の妥当性確認は行われま" "せん (オプション \"ssl_verify\") (注意: 値は評価されます、/help eval を参照し" "てください; ここで ${irc_server.xxx} はサーバオプション、${server} はサーバ名" @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" -"PO-Revision-Date: 2019-03-17 16:04+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" +"PO-Revision-Date: 2019-03-21 23:32+0100\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" "Language: pl\n" @@ -8971,16 +8971,16 @@ msgstr "" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " "${irc_server.xxx} and ${server} is replaced by the server name)" msgstr "" "skrót certyfikatu, który jest zaufany i akceptowany dla serwera; tylko cyfry " -"heksadecymalne są dozwolone (0-9, a-f): 64 znaki dla SHA-512, 32 znaki dla " -"SHA-256, 20 znaków dla SHA-1 (mało bezpieczne, nie zalecane); wiele skrótów " +"heksadecymalne są dozwolone (0-9, a-f): 128 znaki dla SHA-512, 64 znaki dla " +"SHA-256, 40 znaków dla SHA-1 (mało bezpieczne, nie zalecane); wiele skrótów " "można oddzielić przecinkami; jeśli ta opcja jest ustawiona, certyfikat NIE " "jest dalej sprawdzany (opcja \"ssl_verify\") (uwaga: zawartość jest " "przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci " @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" -"PO-Revision-Date: 2019-03-17 16:04+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" +"PO-Revision-Date: 2019-03-21 23:33+0100\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" "Language: pt\n" @@ -8646,23 +8646,15 @@ msgstr "" msgid "size of the key used during the Diffie-Hellman Key Exchange" msgstr "tamanho da chave usada durante a troca de chaves de Diffie-Hellman" -#, fuzzy msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " "${irc_server.xxx} and ${server} is replaced by the server name)" msgstr "" -"impressão digital do certificado considerado fidedigno e aceite do servidor; " -"só são permitidos dígitos hexadecimais (0-9, a-f): 64 carateres para " -"SHA-512, 32 carateres para SHA-256, 20 carateres para SHA-1 (inseguro, não " -"recomendado); pode separar várias impressões digitais por vírgula; se esta " -"opção estiver definida, NÃO são realizadas as outras verificações aos " -"certificados (opção \"ssl_verify\") (nota: o conteúdo é avaliado, ver /help " -"eval)" msgid "check that the SSL connection is fully trusted" msgstr "verificar se a conexão SSL é totalmente fidedigna" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4dec50f03..f5043aea9 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: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7719,8 +7719,8 @@ msgstr "tamanho da chave utilizada durante a Troca de Chaves Diffie-Hellman" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" "PO-Revision-Date: 2019-03-11 21:10+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7316,8 +7316,8 @@ msgstr "" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+0100\n" "PO-Revision-Date: 2019-03-17 16:04+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6628,8 +6628,8 @@ msgstr "" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " diff --git a/po/weechat.pot b/po/weechat.pot index fe6491975..c36ff83fa 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: 2019-03-19 20:34+0100\n" +"POT-Creation-Date: 2019-03-21 23:30+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" @@ -6500,8 +6500,8 @@ msgstr "" msgid "" "fingerprint of certificate which is trusted and accepted for the server; " -"only hexadecimal digits are allowed (0-9, a-f): 64 chars for SHA-512, 32 " -"chars for SHA-256, 20 chars for SHA-1 (insecure, not recommended); many " +"only hexadecimal digits are allowed (0-9, a-f): 128 chars for SHA-512, 64 " +"chars for SHA-256, 40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option is set, the other " "checks on certificates are NOT performed (option \"ssl_verify\") (note: " "content is evaluated, see /help eval; server options are evaluated with " diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 015950753..4cf44d175 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -1735,8 +1735,8 @@ irc_config_server_new_option (struct t_config_file *config_file, option_name, "string", N_("fingerprint of certificate which is trusted and accepted " "for the server; only hexadecimal digits are allowed (0-9, " - "a-f): 64 chars for SHA-512, 32 chars for SHA-256, " - "20 chars for SHA-1 (insecure, not recommended); many " + "a-f): 128 chars for SHA-512, 64 chars for SHA-256, " + "40 chars for SHA-1 (insecure, not recommended); many " "fingerprints can be separated by commas; if this option " "is set, the other checks on certificates are NOT " "performed (option \"ssl_verify\") " diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index b82df75c4..36dd6889e 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -4147,7 +4147,7 @@ irc_server_fingerprint_search_algo_with_size (int size) * Returns a string with sizes of allowed fingerprint, * in number of hexadecimal digits (== bits / 4). * - * Example of output: "64=SHA-512, 32=SHA-256, 20=SHA-1". + * Example of output: "128=SHA-512, 64=SHA-256, 40=SHA-1". * * Note: result must be freed after use. */ @@ -4165,7 +4165,7 @@ irc_server_fingerprint_str_sizes () { snprintf (str_one_size, sizeof (str_one_size), "%d=%s%s", - irc_fingerprint_digest_algos_size[i] / 8, + irc_fingerprint_digest_algos_size[i] / 4, irc_fingerprint_digest_algos_name[i], (i > 0) ? ", " : ""); strcat (str_sizes, str_one_size); |