diff -Naur old/DES_bs_b.c new/DES_bs_b.c --- old/DES_bs_b.c 2011-11-19 08:27:47.000000000 +0530 +++ new/DES_bs_b.c 2012-06-10 10:51:29.000000000 +0530 @@ -1462,7 +1462,8 @@ #pragma omp parallel for default(none) private(t) shared(n, DES_bs_all_p, keys_count) #endif for_each_t(n) { - ARCH_WORD **k; + //ARCH_WORD **k; + DES_bs_vector *k; int rounds; #if DES_BS_VECTOR_LOOPS int depth; @@ -1481,12 +1482,12 @@ } #if DES_bs_mt - DES_bs_finalize_keys_LM(t); + DES_bs_finalize_keys(t); #else - DES_bs_finalize_keys_LM(); + DES_bs_finalize_keys(); #endif - k = DES_bs_all.KS.p; + k = DES_bs_all.KS.v; rounds = 8; do { diff -Naur old/DES_bs.c new/DES_bs.c --- old/DES_bs.c 2011-12-16 02:27:19.000000000 +0530 +++ new/DES_bs.c 2012-06-10 10:58:25.000000000 +0530 @@ -98,7 +98,7 @@ for_each_t(n) { #if DES_BS_EXPAND if (LM) - k = DES_bs_all.KS.p; + k = DES_bs_all.KSp;//using k = DES_bs_all.KSp instead of k = DES_bs_all.KS.p else k = DES_bs_all.KSp; #else @@ -117,7 +117,7 @@ bit ^= 070; bit -= bit >> 3; bit = 55 - bit; - if (LM) bit = DES_LM_KP[bit]; + //if (LM) bit = DES_LM_KP[bit]; *k++ = &DES_bs_all.K[bit] START; } } @@ -130,7 +130,7 @@ DES_bs_all.pxkeys[index] = &DES_bs_all.xkeys.c[0][index & 7][index >> 3]; - if (LM) { + /*if (LM) { for (c = 0; c < 0x100; c++) #ifdef BENCH_BUILD if (c >= 'a' && c <= 'z') @@ -150,7 +150,7 @@ #else DES_bs_set_salt(0); #endif - } + }*/ #if !DES_BS_ASM memset(&DES_bs_all.zero, 0, sizeof(DES_bs_all.zero)); diff -Naur old/LM_fmt.c new/LM_fmt.c --- old/LM_fmt.c 2011-12-16 02:27:19.000000000 +0530 +++ new/LM_fmt.c 2012-06-10 10:39:20.000000000 +0530 @@ -24,15 +24,8 @@ #define LM_EMPTY "aad3b435b51404ee" static struct fmt_tests tests[] = { - {"$LM$a9c604d244c4e99d", "AAAAAA"}, - {"$LM$cbc501a4d2227783", "AAAAAAA"}, - {"$LM$3466c2b0487fe39a", "CRACKPO"}, - {"$LM$dbc5e5cba8028091", "IMPUNIT"}, - {LM_EMPTY LM_EMPTY, ""}, - {"$LM$73cc402bd3e79175", "SCLEROS"}, - {"$LM$5ecd9236d21095ce", "YOKOHAM"}, - {"$LM$A5E6066DE61C3E35", "ZZZZZZZ"}, /* uppercase encoding */ - {"$LM$1FB363feB834C12D", "ZZZZZZ"}, /* mixed case encoding */ + {"$LM$aad3b435b51404ee", ""}, + {"$LM$63f22fe8518a5691", "AAAAAAAA"},//ciphertext 63f22fe8518a5691 after simple Des Encrytion of plaintext "KGS!@#$%" {NULL} }; @@ -220,7 +213,7 @@ }, fmt_default_salt_hash, fmt_default_set_salt, - DES_bs_set_key_LM, + DES_bs_set_key, get_key, fmt_default_clear_keys, DES_bs_crypt_LM, @@ -238,3 +231,16 @@ cmp_exact } }; + + + + + + + + + + + + +