Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/obscure.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/obscure.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/libbb/obscure.c

@@ -5 +5 @@
  * Copyright (C) 2006 Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -46 +46 @@
 static int string_checker_helper(const char *p1, const char *p2)
 {
+    /* as sub-string */
+    if (strcasestr(p2, p1) != NULL
+    /* invert in case haystack is shorter than needle */
+     || strcasestr(p1, p2) != NULL
     /* as-is or capitalized */
-    if (strcasecmp(p1, p2) == 0
-    /* as sub-string */
-    || strcasestr(p2, p1) != NULL
-    /* invert in case haystack is shorter than needle */
-    || strcasestr(p1, p2) != NULL)
+    /* || strcasecmp(p1, p2) == 0 - 1st strcasestr should catch this too */
+    ) {
         return 1;
+    }
     return 0;
 }
@@ -58 +60 @@
 static int string_checker(const char *p1, const char *p2)
 {
-    int size;
+    int size, i;
     /* check string */
     int ret = string_checker_helper(p1, p2);
-    /* Make our own copy */
+    /* make our own copy */
     char *p = xstrdup(p1);
+
     /* reverse string */
-    size = strlen(p);
+    i = size = strlen(p1);
+    while (--i >= 0) {
+        *p++ = p1[i];
+    }
+    p -= size; /* restore pointer */
 
-    while (size--) {
-        *p = p1[size];
-        p++;
-    }
-    /* restore pointer */
-    p -= strlen(p1);
     /* check reversed string */
     ret |= string_checker_helper(p, p2);
+
     /* clean up */
-    memset(p, 0, strlen(p1));
+    memset(p, 0, size);
     free(p);
+
     return ret;
 }
 
-#define LOWERCASE          1
-#define UPPERCASE          2
-#define NUMBERS            4
-#define SPECIAL            8
+#define CATEGORIES  4
+
+#define LOWERCASE   1
+#define UPPERCASE   2
+#define NUMBERS     4
+#define SPECIAL     8
+
+#define LAST_CAT    8
 
 static const char *obscure_msg(const char *old_p, const char *new_p, const struct passwd *pw)
 {
-    int i;
-    int c;
-    int length;
-    int mixed = 0;
-    /* Add 2 for each type of characters to the minlen of password */
-    int size = CONFIG_PASSWORD_MINLEN + 8;
+    unsigned length;
+    unsigned size;
+    unsigned mixed;
+    unsigned c;
+    unsigned i;
     const char *p;
-    char hostname[255];
+    char *hostname;
 
     /* size */
@@ -105 +111 @@
     }
     /* no gecos as-is, as sub-string, reversed, capitalized, doubled */
-    if (*pw->pw_gecos && string_checker(new_p, pw->pw_gecos)) {
+    if (pw->pw_gecos[0] && string_checker(new_p, pw->pw_gecos)) {
         return "similar to gecos";
     }
     /* hostname as-is, as sub-string, reversed, capitalized, doubled */
-    if (gethostname(hostname, 255) == 0) {
-        hostname[254] = '\0';
-        if (string_checker(new_p, hostname)) {
-            return "similar to hostname";
-        }
-    }
+    hostname = safe_gethostname();
+    i = string_checker(new_p, hostname);
+    free(hostname);
+    if (i)
+        return "similar to hostname";
 
     /* Should / Must contain a mix of: */
+    mixed = 0;
     for (i = 0; i < length; i++) {
         if (islower(new_p[i])) {        /* a-z */
@@ -127 +133 @@
             mixed |= SPECIAL;
         }
-        /* More than 50% similar characters ? */
+        /* Count i'th char */
         c = 0;
         p = new_p;
         while (1) {
-            if ((p = strchr(p, new_p[i])) == NULL) {
+            p = strchr(p, new_p[i]);
+            if (p == NULL) {
                 break;
             }
             c++;
-            if (!++p) {
-                break; /* move past the matched char if possible */
+            p++;
+            if (!*p) {
+                break;
             }
         }
-
-        if (c >= (length / 2)) {
+        /* More than 50% similar characters ? */
+        if (c*2 >= length) {
             return "too many similar characters";
         }
     }
-    for (i=0; i<4; i++)
-        if (mixed & (1<<i)) size -= 2;
+
+    size = CONFIG_PASSWORD_MINLEN + 2*CATEGORIES;
+    for (i = 1; i <= LAST_CAT; i <<= 1)
+        if (mixed & i)
+            size -= 2;
     if (length < size)
         return "too weak";
 
-    if (old_p && old_p[0] != '\0') {
+    if (old_p && old_p[0]) {
         /* check vs. old password */
         if (string_checker(new_p, old_p)) {
@@ -155 +166 @@
         }
     }
+
     return NULL;
 }
 
-int obscure(const char *old, const char *newval, const struct passwd *pw)
+int FAST_FUNC obscure(const char *old, const char *newval, const struct passwd *pw)
 {
     const char *msg;