diff --git a/OpenCL/m90000_a0-optimized.cl b/OpenCL/m34200_a0-optimized.cl similarity index 91% rename from OpenCL/m90000_a0-optimized.cl rename to OpenCL/m34200_a0-optimized.cl index f61422fe8..82448631c 100755 --- a/OpenCL/m90000_a0-optimized.cl +++ b/OpenCL/m34200_a0-optimized.cl @@ -67,7 +67,7 @@ DECLSPEC u64 MurmurHash64A (const u64 seed, PRIVATE_AS const u32 *data, const u3 return hash; } -KERNEL_FQ KERNEL_FA void m90000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -126,15 +126,15 @@ KERNEL_FQ KERNEL_FA void m90000_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -205,10 +205,10 @@ KERNEL_FQ KERNEL_FA void m90000_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m90000_a0-pure.cl b/OpenCL/m34200_a0-pure.cl similarity index 96% rename from OpenCL/m90000_a0-pure.cl rename to OpenCL/m34200_a0-pure.cl index a130fb50d..7a820464d 100755 --- a/OpenCL/m90000_a0-pure.cl +++ b/OpenCL/m34200_a0-pure.cl @@ -67,7 +67,7 @@ DECLSPEC u64 MurmurHash64A (const u64 seed, PRIVATE_AS const u32 *data, const u3 return hash; } -KERNEL_FQ KERNEL_FA void m90000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -114,7 +114,7 @@ KERNEL_FQ KERNEL_FA void m90000_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34200_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m90000_a1-optimized.cl b/OpenCL/m34200_a1-optimized.cl similarity index 95% rename from OpenCL/m90000_a1-optimized.cl rename to OpenCL/m34200_a1-optimized.cl index 405885110..46b9d4e3c 100755 --- a/OpenCL/m90000_a1-optimized.cl +++ b/OpenCL/m34200_a1-optimized.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (const u64 seed, PRIVATE_AS const u32 *data, const u3 return hash; } -KERNEL_FQ KERNEL_FA void m90000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -183,15 +183,15 @@ KERNEL_FQ KERNEL_FA void m90000_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -321,10 +321,10 @@ KERNEL_FQ KERNEL_FA void m90000_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m90000_a1-pure.cl b/OpenCL/m34200_a1-pure.cl similarity index 97% rename from OpenCL/m90000_a1-pure.cl rename to OpenCL/m34200_a1-pure.cl index 1c86763fd..9a75e24da 100755 --- a/OpenCL/m90000_a1-pure.cl +++ b/OpenCL/m34200_a1-pure.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (const u64 seed, PRIVATE_AS const u32 *data, const u3 return hash; } -KERNEL_FQ KERNEL_FA void m90000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -123,7 +123,7 @@ KERNEL_FQ KERNEL_FA void m90000_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34200_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m90000_a3-optimized.cl b/OpenCL/m34200_a3-optimized.cl similarity index 91% rename from OpenCL/m90000_a3-optimized.cl rename to OpenCL/m34200_a3-optimized.cl index 3edb18ef6..e90809b16 100755 --- a/OpenCL/m90000_a3-optimized.cl +++ b/OpenCL/m34200_a3-optimized.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (const u64 seed, PRIVATE_AS const u32 *data, const u3 return hash; } -DECLSPEC void m90000m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m34200m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -127,7 +127,7 @@ DECLSPEC void m90000m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_F } } -DECLSPEC void m90000s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m34200s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -201,7 +201,7 @@ DECLSPEC void m90000s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_F } } -KERNEL_FQ KERNEL_FA void m90000_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -238,10 +238,10 @@ KERNEL_FQ KERNEL_FA void m90000_m04 (KERN_ATTR_VECTOR ()) * main */ - m90000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90000_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -278,10 +278,10 @@ KERNEL_FQ KERNEL_FA void m90000_m08 (KERN_ATTR_VECTOR ()) * main */ - m90000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90000_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -318,10 +318,10 @@ KERNEL_FQ KERNEL_FA void m90000_m16 (KERN_ATTR_VECTOR ()) * main */ - m90000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90000_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -358,10 +358,10 @@ KERNEL_FQ KERNEL_FA void m90000_s04 (KERN_ATTR_VECTOR ()) * main */ - m90000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90000_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -398,10 +398,10 @@ KERNEL_FQ KERNEL_FA void m90000_s08 (KERN_ATTR_VECTOR ()) * main */ - m90000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90000_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -438,5 +438,5 @@ KERNEL_FQ KERNEL_FA void m90000_s16 (KERN_ATTR_VECTOR ()) * main */ - m90000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } diff --git a/OpenCL/m90000_a3-pure.cl b/OpenCL/m34200_a3-pure.cl similarity index 96% rename from OpenCL/m90000_a3-pure.cl rename to OpenCL/m34200_a3-pure.cl index 6161762f6..4cc2400df 100755 --- a/OpenCL/m90000_a3-pure.cl +++ b/OpenCL/m34200_a3-pure.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (const u64 seed, PRIVATE_AS const u32 *data, const u3 return hash; } -KERNEL_FQ KERNEL_FA void m90000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -122,7 +122,7 @@ KERNEL_FQ KERNEL_FA void m90000_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ KERNEL_FA void m90000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34200_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m90010_a0-optimized.cl b/OpenCL/m34201_a0-optimized.cl similarity index 90% rename from OpenCL/m90010_a0-optimized.cl rename to OpenCL/m34201_a0-optimized.cl index 61585984d..74245f6b1 100755 --- a/OpenCL/m90010_a0-optimized.cl +++ b/OpenCL/m34201_a0-optimized.cl @@ -67,7 +67,7 @@ DECLSPEC u64 MurmurHash64A (PRIVATE_AS const u32 *data, const u32 len) return hash; } -KERNEL_FQ KERNEL_FA void m90010_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -117,15 +117,15 @@ KERNEL_FQ KERNEL_FA void m90010_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90010_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90010_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90010_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -187,10 +187,10 @@ KERNEL_FQ KERNEL_FA void m90010_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90010_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90010_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m90010_a0-pure.cl b/OpenCL/m34201_a0-pure.cl similarity index 95% rename from OpenCL/m90010_a0-pure.cl rename to OpenCL/m34201_a0-pure.cl index 8259e740a..805f22198 100755 --- a/OpenCL/m90010_a0-pure.cl +++ b/OpenCL/m34201_a0-pure.cl @@ -67,7 +67,7 @@ DECLSPEC u64 MurmurHash64A (PRIVATE_AS const u32 *data, const u32 len) return hash; } -KERNEL_FQ KERNEL_FA void m90010_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -105,7 +105,7 @@ KERNEL_FQ KERNEL_FA void m90010_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90010_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34201_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m90010_a1-optimized.cl b/OpenCL/m34201_a1-optimized.cl similarity index 95% rename from OpenCL/m90010_a1-optimized.cl rename to OpenCL/m34201_a1-optimized.cl index 1eba4d2dd..c3337c057 100755 --- a/OpenCL/m90010_a1-optimized.cl +++ b/OpenCL/m34201_a1-optimized.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (PRIVATE_AS const u32 *data, const u32 len) return hash; } -KERNEL_FQ KERNEL_FA void m90010_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -174,15 +174,15 @@ KERNEL_FQ KERNEL_FA void m90010_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90010_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90010_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90010_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -303,10 +303,10 @@ KERNEL_FQ KERNEL_FA void m90010_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90010_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90010_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m90010_a1-pure.cl b/OpenCL/m34201_a1-pure.cl similarity index 96% rename from OpenCL/m90010_a1-pure.cl rename to OpenCL/m34201_a1-pure.cl index 33ee4f66a..0daf17ec8 100755 --- a/OpenCL/m90010_a1-pure.cl +++ b/OpenCL/m34201_a1-pure.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (PRIVATE_AS const u32 *data, const u32 len) return hash; } -KERNEL_FQ KERNEL_FA void m90010_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -114,7 +114,7 @@ KERNEL_FQ KERNEL_FA void m90010_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90010_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34201_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m90010_a3-optimized.cl b/OpenCL/m34201_a3-optimized.cl similarity index 90% rename from OpenCL/m90010_a3-optimized.cl rename to OpenCL/m34201_a3-optimized.cl index ed54415d6..b20404cdc 100755 --- a/OpenCL/m90010_a3-optimized.cl +++ b/OpenCL/m34201_a3-optimized.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (PRIVATE_AS const u32 *data, const u32 len) return hash; } -DECLSPEC void m90010m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m34201m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -118,7 +118,7 @@ DECLSPEC void m90010m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_F } } -DECLSPEC void m90010s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m34201s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -183,7 +183,7 @@ DECLSPEC void m90010s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_F } } -KERNEL_FQ KERNEL_FA void m90010_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -220,10 +220,10 @@ KERNEL_FQ KERNEL_FA void m90010_m04 (KERN_ATTR_VECTOR ()) * main */ - m90010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34201m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90010_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -260,10 +260,10 @@ KERNEL_FQ KERNEL_FA void m90010_m08 (KERN_ATTR_VECTOR ()) * main */ - m90010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34201m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90010_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -300,10 +300,10 @@ KERNEL_FQ KERNEL_FA void m90010_m16 (KERN_ATTR_VECTOR ()) * main */ - m90010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34201m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90010_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -340,10 +340,10 @@ KERNEL_FQ KERNEL_FA void m90010_s04 (KERN_ATTR_VECTOR ()) * main */ - m90010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34201s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90010_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -380,10 +380,10 @@ KERNEL_FQ KERNEL_FA void m90010_s08 (KERN_ATTR_VECTOR ()) * main */ - m90010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34201s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90010_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -420,5 +420,5 @@ KERNEL_FQ KERNEL_FA void m90010_s16 (KERN_ATTR_VECTOR ()) * main */ - m90010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34201s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } diff --git a/OpenCL/m90010_a3-pure.cl b/OpenCL/m34201_a3-pure.cl similarity index 96% rename from OpenCL/m90010_a3-pure.cl rename to OpenCL/m34201_a3-pure.cl index 6db8db29b..f08ec0cdb 100755 --- a/OpenCL/m90010_a3-pure.cl +++ b/OpenCL/m34201_a3-pure.cl @@ -65,7 +65,7 @@ DECLSPEC u64 MurmurHash64A (PRIVATE_AS const u32 *data, const u32 len) return hash; } -KERNEL_FQ KERNEL_FA void m90010_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -113,7 +113,7 @@ KERNEL_FQ KERNEL_FA void m90010_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ KERNEL_FA void m90010_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34201_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m90030_a0-optimized.cl b/OpenCL/m34211_a0-optimized.cl similarity index 90% rename from OpenCL/m90030_a0-optimized.cl rename to OpenCL/m34211_a0-optimized.cl index bfe1a3b7e..18342ac79 100755 --- a/OpenCL/m90030_a0-optimized.cl +++ b/OpenCL/m34211_a0-optimized.cl @@ -68,7 +68,7 @@ DECLSPEC u32 MurmurHash64A_truncated (PRIVATE_AS const u32 *data, const u32 len) return (u32) (hash >> 32); } -KERNEL_FQ KERNEL_FA void m90030_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34211_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -116,15 +116,15 @@ KERNEL_FQ KERNEL_FA void m90030_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90030_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34211_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90030_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34211_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90030_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34211_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -184,10 +184,10 @@ KERNEL_FQ KERNEL_FA void m90030_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ KERNEL_FA void m90030_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34211_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ KERNEL_FA void m90030_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ KERNEL_FA void m34211_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m90030_a1-optimized.cl b/OpenCL/m34211_a1-optimized.cl similarity index 95% rename from OpenCL/m90030_a1-optimized.cl rename to OpenCL/m34211_a1-optimized.cl index d1ea374c0..c1cf3f301 100755 --- a/OpenCL/m90030_a1-optimized.cl +++ b/OpenCL/m34211_a1-optimized.cl @@ -66,7 +66,7 @@ DECLSPEC u32 MurmurHash64A_truncated (PRIVATE_AS const u32 *data, const u32 len) return (u32) (hash >> 32); } -KERNEL_FQ KERNEL_FA void m90030_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34211_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -173,15 +173,15 @@ KERNEL_FQ KERNEL_FA void m90030_m04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90030_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34211_m08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90030_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34211_m16 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90030_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34211_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -300,10 +300,10 @@ KERNEL_FQ KERNEL_FA void m90030_s04 (KERN_ATTR_BASIC ()) } } -KERNEL_FQ KERNEL_FA void m90030_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34211_s08 (KERN_ATTR_BASIC ()) { } -KERNEL_FQ KERNEL_FA void m90030_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ KERNEL_FA void m34211_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m90030_a3-optimized.cl b/OpenCL/m34211_a3-optimized.cl similarity index 90% rename from OpenCL/m90030_a3-optimized.cl rename to OpenCL/m34211_a3-optimized.cl index d36ad3c93..44531d8c7 100755 --- a/OpenCL/m90030_a3-optimized.cl +++ b/OpenCL/m34211_a3-optimized.cl @@ -66,7 +66,7 @@ DECLSPEC u32 MurmurHash64A_truncated (PRIVATE_AS const u32 *data, const u32 len) return (u32) (hash >> 32); } -DECLSPEC void m90030m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m34211m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -117,7 +117,7 @@ DECLSPEC void m90030m (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_F } } -DECLSPEC void m90030s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) +DECLSPEC void m34211s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_FUNC_VECTOR ()) { /** * modifiers are taken from args @@ -180,7 +180,7 @@ DECLSPEC void m90030s (PRIVATE_AS const u32 *data, const u32 pw_len, KERN_ATTR_F } } -KERNEL_FQ KERNEL_FA void m90030_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34211_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -217,10 +217,10 @@ KERNEL_FQ KERNEL_FA void m90030_m04 (KERN_ATTR_VECTOR ()) * main */ - m90030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34211m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90030_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34211_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -257,10 +257,10 @@ KERNEL_FQ KERNEL_FA void m90030_m08 (KERN_ATTR_VECTOR ()) * main */ - m90030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34211m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90030_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34211_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -297,10 +297,10 @@ KERNEL_FQ KERNEL_FA void m90030_m16 (KERN_ATTR_VECTOR ()) * main */ - m90030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34211m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90030_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34211_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -337,10 +337,10 @@ KERNEL_FQ KERNEL_FA void m90030_s04 (KERN_ATTR_VECTOR ()) * main */ - m90030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34211s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90030_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34211_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -377,10 +377,10 @@ KERNEL_FQ KERNEL_FA void m90030_s08 (KERN_ATTR_VECTOR ()) * main */ - m90030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34211s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } -KERNEL_FQ KERNEL_FA void m90030_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ KERNEL_FA void m34211_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -417,5 +417,5 @@ KERNEL_FQ KERNEL_FA void m90030_s16 (KERN_ATTR_VECTOR ()) * main */ - m90030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); + m34211s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, kernel_param, gid, lid, lsz); } diff --git a/src/modules/module_90000.c b/src/modules/module_34200.c similarity index 99% rename from src/modules/module_90000.c rename to src/modules/module_34200.c index db20ffc15..a9883e8ae 100755 --- a/src/modules/module_90000.c +++ b/src/modules/module_34200.c @@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_8_2; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_CHECKSUM; static const char *HASH_NAME = "MurmurHash64A"; -static const u64 KERN_TYPE = 90000; +static const u64 KERN_TYPE = 34200; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_USES_BITS_64 | OPTI_TYPE_NOT_ITERATED; diff --git a/src/modules/module_90010.c b/src/modules/module_34201.c similarity index 99% rename from src/modules/module_90010.c rename to src/modules/module_34201.c index 9bce40591..bd6dcb24a 100755 --- a/src/modules/module_90010.c +++ b/src/modules/module_34201.c @@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_8_2; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const char *HASH_NAME = "MurmurHash64A (zero seed)"; -static const u64 KERN_TYPE = 90010; +static const u64 KERN_TYPE = 34201; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_USES_BITS_64 | OPTI_TYPE_NOT_ITERATED diff --git a/src/modules/module_90030.c b/src/modules/module_34211.c similarity index 99% rename from src/modules/module_90030.c rename to src/modules/module_34211.c index c6ef5646c..e3bc94a54 100755 --- a/src/modules/module_90030.c +++ b/src/modules/module_34211.c @@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_4_4; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const char *HASH_NAME = "MurmurHash64A truncated (zero seed)"; -static const u64 KERN_TYPE = 90030; +static const u64 KERN_TYPE = 34211; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_USES_BITS_64 | OPTI_TYPE_NOT_ITERATED diff --git a/tools/test_modules/m90000.pm b/tools/test_modules/m34200.pm similarity index 100% rename from tools/test_modules/m90000.pm rename to tools/test_modules/m34200.pm diff --git a/tools/test_modules/m90010.pm b/tools/test_modules/m34201.pm similarity index 96% rename from tools/test_modules/m90010.pm rename to tools/test_modules/m34201.pm index b093a4efd..218466450 100755 --- a/tools/test_modules/m90010.pm +++ b/tools/test_modules/m34201.pm @@ -25,12 +25,12 @@ sub wrapping_mul my $m = Math::BigInt->new("0xc6a4a7935bd1e995"); my $r = 47; -sub murmurhash64a +sub murmurhash64a_zero_seed { use integer; my $word = shift; - my $seed = shift; + my $seed = 0; my @chars = unpack ("C*", $word); my $len = length $word; @@ -115,7 +115,7 @@ sub module_generate_hash { my $word = shift; - my $digest = murmurhash64a ($word); + my $digest = murmurhash64a_zero_seed ($word); $digest = unpack ("H*", pack ("Q>", $digest)); diff --git a/tools/test_modules/m90030.pm b/tools/test_modules/m34211.pm similarity index 95% rename from tools/test_modules/m90030.pm rename to tools/test_modules/m34211.pm index e14d2401d..78bbec496 100755 --- a/tools/test_modules/m90030.pm +++ b/tools/test_modules/m34211.pm @@ -25,12 +25,12 @@ sub wrapping_mul my $m = Math::BigInt->new("0xc6a4a7935bd1e995"); my $r = 47; -sub murmurhash64a_32 +sub murmurhash64a_truncated_zero_seed { use integer; my $word = shift; - my $seed = shift; + my $seed = 0; my @chars = unpack ("C*", $word); my $len = length $word; @@ -118,7 +118,7 @@ sub module_generate_hash { my $word = shift; - my $digest = murmurhash64a_32 ($word); + my $digest = murmurhash64a_truncated_zero_seed ($word); $digest = unpack ("H*", pack ("L>", $digest));