Allow a user-configurable minimum password length.

diff --git a/libbb/Config.in b/libbb/Config.in
index 3ddb7d96cc350274aafcbc5a44bffd91157fe235..c5406cbb936dfdf96f949329bcab8d347f8b0a02 100644 (file)
--- a/libbb/Config.in
+++ b/libbb/Config.in
@@ -5,6 +5,13 @@
 
 menu "Busybox Library Tuning"
 
+config CONFIG_PASSWORD_MINLEN
+       int "Minimum password length"
+       default 6
+       range 5 32
+       help
+         Minimum allowable password length.
+
 config CONFIG_MD5_SIZE_VS_SPEED
        int " MD5: Trade Bytes for Speed"
        default 2

diff --git a/libbb/obscure.c b/libbb/obscure.c
index d6a87b5de06eeb2df74d90a47daced72b5ef291a..4a8fbf72c742e96ff73d74b044afbc11d60599de 100644 (file)
--- a/libbb/obscure.c
+++ b/libbb/obscure.c
@@ -46,11 +46,6 @@
 
 #include "libbb.h"
 
-
-/* passwords should consist of 6 (to 8 characters) */
-#define MINLEN 6
-
-
 static int string_checker_helper(const char *p1, const char *p2) __attribute__ ((__pure__));
 
 static int string_checker_helper(const char *p1, const char *p2)
@@ -101,12 +96,12 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
        int length;
        int mixed = 0;
        /* Add 1 for each type of characters to the minlen of password */
-       int size = MINLEN + 8;
+       int size = CONFIG_PASSWORD_MINLEN + 8;
        const char *p;
        char hostname[255];
 
        /* size */
-       if (!new_p || (length = strlen(new_p)) < MINLEN)
+       if (!new_p || (length = strlen(new_p)) < CONFIG_PASSWORD_MINLEN)
                return("too short");
 
        /* no username as-is, as sub-string, reversed, capitalized, doubled */