Update testing to allow for very long passwords.

2 files changed, 15 insertions, 6 deletions

diff --git a/test.c b/test.c
index df2b41f..82ab295 100644
--- a/test.c
+++ b/test.c
@@ -75,6 +75,8 @@ static void CalcPass(const char *Pwd, int Quiet)
                 case SEQUENCE_MATCH:                  printf("  Type: Sequence       ");   break;
                 case SPATIAL_MATCH:                   printf("  Type: Spatial        ");   break;
                 case DATE_MATCH:                      printf("  Type: Date           ");   break;
+                case YEAR_MATCH:                      printf("  Type: Year           ");   break;
+                case LONG_PWD_MATCH:                  printf("  Type: Extra-long     ");   break;
                 case BRUTE_MATCH+MULTIPLE_MATCH:      printf("  Type: Bruteforce(Rep)");   break;
                 case DICTIONARY_MATCH+MULTIPLE_MATCH: printf("  Type: Dictionary(Rep)");   break;
                 case DICT_LEET_MATCH+MULTIPLE_MATCH:  printf("  Type: Dict+Leet(Rep) ");   break;
@@ -84,6 +86,8 @@ static void CalcPass(const char *Pwd, int Quiet)
                 case SEQUENCE_MATCH+MULTIPLE_MATCH:   printf("  Type: Sequence(Rep)  ");   break;
                 case SPATIAL_MATCH+MULTIPLE_MATCH:    printf("  Type: Spatial(Rep)   ");   break;
                 case DATE_MATCH+MULTIPLE_MATCH:       printf("  Type: Date(Rep)      ");   break;
+                case YEAR_MATCH+MULTIPLE_MATCH:       printf("  Type: Year(Rep)      ");   break;
+                case LONG_PWD_MATCH+MULTIPLE_MATCH:   printf("  Type: Extra-long(Rep)");   break;
 
                 default:                printf("  Type: Unknown%d ", p->Type);   break;
             }
@@ -112,7 +116,7 @@ static void CalcPass(const char *Pwd, int Quiet)
 
 int DoChecks(char *file)
 {
-    char Line[500];
+    char Line[5000];
     int y = 0;
     int w = 0;
     int r = 0;
@@ -170,7 +174,7 @@ int DoChecks(char *file)
         }
 
         Ent = atof(t);
-        if ((Ent < 0.0) || (Ent > 1000.0))
+        if ((Ent < 0.0) || (Ent > 10000.0))
         {
             printf("Bad entropy value on line %d\n", y);
             r = 1;
@@ -254,11 +258,11 @@ int main(int argc, char **argv)
         }
         return 0;
     }
-    i = 1+Quiet;
+    i = 1+Quiet+White;
     if (i >= argc)
     {
         /* No test passwords on command line, so get them from stdin */
-        char Line[500];
+        char Line[5000];
         while(fgets(Line, sizeof Line, stdin))
         {
             /* Drop the trailing newline character */
diff --git a/testcases.txt b/testcases.txt
index cddf519..328298a 100644
--- a/testcases.txt
+++ b/testcases.txt
@@ -62,5 +62,10 @@ quvpzquvpz               24.50
 #-- with UK KBD  (US-KBD=17.08)
 jkl;'#                   11.12
 
-magicfavoriteunclepromisedpublicbotherislandjimseriouslycellleadknowingbrokenadvicesomehowpaidblairlosingpushhelpedkillingusuallyearlierbosslaurabeginninglikedinnocentdocruleselizabethsabrinasummerexcoplearnedthirtyrisklettingphillipspeakingofficerridiculoussupportafternoonericwithsobutallwellareheohaboutrightyou're   545.9
-
+# Only first 100 chars have full estimation, extras are processed as repeated digits
+magicfavoriteunclepromisedpublicbotherislandjimseriouslycellleadknowingbrokenadvicesomehowpaidblair      180.29
+magicfavoriteunclepromisedpublicbotherislandjimseriouslycellleadknowingbrokenadvicesomehowpaidblairl     186.74
+magicfavoriteunclepromisedpublicbotherislandjimseriouslycellleadknowingbrokenadvicesomehowpaidblairlo    189.49
+magicfavoriteunclepromisedpublicbotherislandjimseriouslycellleadknowingbrokenadvicesomehowpaidblairlos   190.07
+magicfavoriteunclepromisedpublicbotherislandjimseriouslycellleadknowingbrokenadvicesomehowpaidblairlosingpushhelpedkillingusuallyearlierbosslaurabeginninglikedinnocentdocruleselizabethsabrinasummerexcoplearnedthirtyrisklettingphillipspeakingofficerridiculoussupportafternoonericwithsobutallwellareheohaboutrightyou're    197.44
++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    566.06