nm: Require the PSK to be at least 20 characters long

diff --git a/src/frontends/gnome/auth-dialog/main.c b/src/frontends/gnome/auth-dialog/main.c
index 57fb4dfe3e47369307778ba1968940310a6c3986..b9fd886d57fc0154b6afc74f38b18efa5a0b93da 100644 (file)
--- a/src/frontends/gnome/auth-dialog/main.c
+++ b/src/frontends/gnome/auth-dialog/main.c
@@ -118,7 +118,7 @@ int main (int argc, char *argv[])
        gchar *name = NULL, *uuid = NULL, *service = NULL, *keyring = NULL, *pass;
        GOptionContext *context;
        char *agent, *type;
-       guint32 itemid;
+       guint32 itemid, minlen = 0;
        GtkWidget *dialog;
        GOptionEntry entries[] = {
                { "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for passwords", NULL},
@@ -182,9 +182,10 @@ int main (int argc, char *argv[])
                        else if (!strcmp(type, "psk"))
                        {
                                dialog = gnome_password_dialog_new(_("VPN password required"),
-                                                       _("Pre-shared key required to establish VPN connection:"),
+                                                       _("Pre-shared key required to establish VPN connection (min. 20 characters):"),
                                                        NULL, NULL, TRUE);
                                gnome_password_dialog_set_show_remember(GNOME_PASSWORD_DIALOG(dialog), TRUE);
+                               minlen = 20;
                        }
                        else /* smartcard */
                        {
@@ -198,12 +199,18 @@ int main (int argc, char *argv[])
                        {
                                gnome_password_dialog_set_password(GNOME_PASSWORD_DIALOG(dialog), pass);
                        }
+
+too_short_retry:
                        if (!gnome_password_dialog_run_and_block(GNOME_PASSWORD_DIALOG(dialog)))
                        {
                                return 1;
                        }
 
                        pass = gnome_password_dialog_get_password(GNOME_PASSWORD_DIALOG(dialog));
+                       if (minlen && strlen(pass) < minlen)
+                       {
+                               goto too_short_retry;
+                       }
                        switch (gnome_password_dialog_get_remember(GNOME_PASSWORD_DIALOG(dialog)))
                        {
                                case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING:

diff --git a/src/frontends/gnome/po/de.po b/src/frontends/gnome/po/de.po
index 291b2ebf169c45c687bec9a2710af4eb9cc62d06..8882b901267a0e6c626375f7a6b97ebfda463fc8 100644 (file)
--- a/src/frontends/gnome/po/de.po
+++ b/src/frontends/gnome/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager-strongswan\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-22 14:00+0100\n"
+"POT-Creation-Date: 2013-11-25 18:14+0100\n"
 "PO-Revision-Date: 2010-02-18 09:20+0100\n"
 "Last-Translator: Martin Willi <martin@strongswan.org>\n"
 "Language-Team: de <martin@strongswan.org>\n"
@@ -161,9 +161,11 @@ msgstr ""
 "Passwort geschützt:"
 
 #: ../auth-dialog/main.c:185
-msgid "Pre-shared key required to establish VPN connection:"
+msgid ""
+"Pre-shared key required to establish VPN connection (min. 20 characters):"
 msgstr ""
-"Für die Erstellung des VPN-Tunnels ist ein Pre-shared Key erforderlich:"
+"Für die Erstellung des VPN-Tunnels ist ein Pre-shared Key erforderlich (min. "
+"20 Zeichen):"
 
 #: ../auth-dialog/main.c:192
 msgid "Smartcard PIN required to establish VPN connection:"