summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog.adoc1
-rw-r--r--po/cs.po6
-rw-r--r--po/de.po6
-rw-r--r--po/es.po6
-rw-r--r--po/fr.po9
-rw-r--r--po/hu.po6
-rw-r--r--po/it.po6
-rw-r--r--po/ja.po6
-rw-r--r--po/pl.po6
-rw-r--r--po/pt.po6
-rw-r--r--po/pt_BR.po6
-rw-r--r--po/ru.po6
-rw-r--r--po/tr.po6
-rw-r--r--po/weechat.pot6
-rw-r--r--src/core/wee-command.c10
-rw-r--r--src/core/wee-secure-config.c2
-rw-r--r--src/core/wee-secure.h13
17 files changed, 86 insertions, 21 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 7d5de75d2..4949a37ad 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -30,6 +30,7 @@ New features::
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: quote NICK command argument sent to the server (issue #1319)
diff --git a/po/cs.po b/po/cs.po
index 0bada6c17..b2b3c4e97 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: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -874,6 +874,10 @@ msgid ""
"secured data or passphrase"
msgstr ""
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr "Heslo smazáno"
diff --git a/po/de.po b/po/de.po
index 69b2dceae..343f83b67 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -913,6 +913,10 @@ msgid ""
msgstr ""
"%sDie Daten müssen zuerst entschlüsselt werden, bevor man diese nutzen kann"
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr "Passphrase gelöscht"
diff --git a/po/es.po b/po/es.po
index 14eb960eb..09ea32fc1 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: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -866,6 +866,10 @@ msgid ""
"secured data or passphrase"
msgstr ""
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
#, fuzzy
msgid "Passphrase deleted"
msgstr "Barra eliminada"
diff --git a/po/fr.po b/po/fr.po
index 472d4b95d..4be71c4ca 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: 2019-03-11 20:59+0100\n"
-"PO-Revision-Date: 2019-03-11 21:10+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
+"PO-Revision-Date: 2019-03-12 21:28+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -895,6 +895,11 @@ msgstr ""
"%sVous devez déchiffrer les données toujours chiffrées avant de faire une "
"opération sur une donnée sécurisée ou la phrase de chiffrement"
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+"%sErreur : la prase de chiffrement est trop longue (max : %d caractères)"
+
msgid "Passphrase deleted"
msgstr "Phrase de chiffrement supprimée"
diff --git a/po/hu.po b/po/hu.po
index 7411b6323..f4c78ad00 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: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+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"
@@ -894,6 +894,10 @@ msgid ""
"secured data or passphrase"
msgstr ""
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
#, fuzzy
msgid "Passphrase deleted"
msgstr "a felhasználók le lettek tiltva"
diff --git a/po/it.po b/po/it.po
index 3abdee94b..574b0daaa 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: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -855,6 +855,10 @@ msgstr ""
"%sÈ necessario decifrare i dati ancora cifrati prima di qualsiasi operazione "
"sui dati sicuri o sulla chiave di cifratura"
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr "Chiave di cifratura eliminata"
diff --git a/po/ja.po b/po/ja.po
index da8fe3fb5..c616bbdb0 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: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -886,6 +886,10 @@ msgid ""
"secured data or passphrase"
msgstr "%s保護データやパスフレーズを操作する前にデータを復号してください"
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr "パスフレーズを削除しました"
diff --git a/po/pl.po b/po/pl.po
index 664876959..f3b3a7bf6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -894,6 +894,10 @@ msgstr ""
"%sMusisz odszyfrować zaszyfrowane dane przed wykonaniem jakiejś operacji na "
"zabezpieczonych danych lub haśle"
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr "Usunięto hasło"
diff --git a/po/pt.po b/po/pt.po
index 61720790a..4150f339a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-03-11 21:10+0100\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@@ -879,6 +879,10 @@ msgstr ""
"%sDeve desencriptar os dados que ainda estão encriptados antes de efetuar "
"alguma operação sobre os dados protegidos ou sobre a frase de acesso"
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr "Frase de acesso eliminada"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e452cbdac..a4c87dcc7 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-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+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"
@@ -889,6 +889,10 @@ msgid ""
"secured data or passphrase"
msgstr ""
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr "Password deletado"
diff --git a/po/ru.po b/po/ru.po
index 941886855..5e997bf84 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: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+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"
@@ -909,6 +909,10 @@ msgid ""
"secured data or passphrase"
msgstr ""
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
#, fuzzy
msgid "Passphrase deleted"
msgstr "команда users отключена"
diff --git a/po/tr.po b/po/tr.po
index 9f9804836..baa813928 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: 2019-03-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+0100\n"
"PO-Revision-Date: 2019-01-29 21:05+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -810,6 +810,10 @@ msgid ""
"secured data or passphrase"
msgstr ""
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 689f4801d..48c7cf708 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-11 20:59+0100\n"
+"POT-Creation-Date: 2019-03-12 21:27+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"
@@ -810,6 +810,10 @@ msgid ""
"secured data or passphrase"
msgstr ""
+#, c-format
+msgid "%sError: passphrase is too long (max: %d chars)"
+msgstr ""
+
msgid "Passphrase deleted"
msgstr ""
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 45bcd1815..ea3832952 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -5466,6 +5466,16 @@ COMMAND_CALLBACK(secure)
if (string_strcasecmp (argv[1], "passphrase") == 0)
{
COMMAND_MIN_ARGS(3, "passphrase");
+ if ((strcmp (argv[2], "-delete") != 0)
+ && (strlen (argv_eol[2]) > SECURE_PASSPHRASE_MAX_LENGTH))
+ {
+ gui_chat_printf (NULL,
+ _("%sError: passphrase is too long "
+ "(max: %d chars)"),
+ gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
+ SECURE_PASSPHRASE_MAX_LENGTH);
+ return WEECHAT_RC_OK;
+ }
passphrase_was_set = 0;
if (secure_passphrase)
{
diff --git a/src/core/wee-secure-config.c b/src/core/wee-secure-config.c
index 2d7149b17..80cd1ebb1 100644
--- a/src/core/wee-secure-config.c
+++ b/src/core/wee-secure-config.c
@@ -54,7 +54,7 @@ void
secure_config_get_passphrase_from_user (const char *error)
{
const char *prompt[5];
- char passphrase[1024];
+ char passphrase[SECURE_PASSPHRASE_MAX_LENGTH + 1];
prompt[0] = _("Please enter your passphrase to decrypt the data secured "
"by WeeChat:");
diff --git a/src/core/wee-secure.h b/src/core/wee-secure.h
index e0a884d56..4b8b047d1 100644
--- a/src/core/wee-secure.h
+++ b/src/core/wee-secure.h
@@ -22,12 +22,13 @@
#include <time.h>
-#define SECURE_ENV_PASSPHRASE "WEECHAT_PASSPHRASE"
-#define SECURE_SALT_DEFAULT "WeeChat!"
-#define SECURE_DATA_PASSPHRASE_FLAG "__passphrase__"
-#define SECURE_SALT_SIZE 8
-#define SECURE_TOTP_MIN_DIGITS 4
-#define SECURE_TOTP_MAX_DIGITS 10
+#define SECURE_ENV_PASSPHRASE "WEECHAT_PASSPHRASE"
+#define SECURE_PASSPHRASE_MAX_LENGTH 4096
+#define SECURE_SALT_DEFAULT "WeeChat!"
+#define SECURE_DATA_PASSPHRASE_FLAG "__passphrase__"
+#define SECURE_SALT_SIZE 8
+#define SECURE_TOTP_MIN_DIGITS 4
+#define SECURE_TOTP_MAX_DIGITS 10
enum t_secure_config_hash_algo
{
generated by cgit debian/1.2.3+git2.25.1-1-2-gaceb0 (git 2.25.1) at 2025-05-02 07:46:51 +0000