diff -urpN JohnTheRipper.orig/src/BF_fmt.c JohnTheRipper/src/BF_fmt.c --- JohnTheRipper.orig/src/BF_fmt.c 2013-06-11 18:58:52.988390352 +0000 +++ JohnTheRipper/src/BF_fmt.c 2013-06-11 19:22:20.856387438 +0000 @@ -137,41 +137,6 @@ static int valid(char *ciphertext, struc return 1; } -static int binary_hash_0(void *binary) -{ - return *(BF_word *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(BF_word *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(BF_word *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(BF_word *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(BF_word *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(BF_word *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(BF_word *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return BF_out[index][0] & 0xF; @@ -309,13 +274,13 @@ struct fmt_main fmt_BF = { BF_std_get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/BSDI_fmt.c JohnTheRipper/src/BSDI_fmt.c --- JohnTheRipper.orig/src/BSDI_fmt.c 2013-06-11 18:58:52.988390352 +0000 +++ JohnTheRipper/src/BSDI_fmt.c 2013-06-11 19:21:02.504387600 +0000 @@ -138,41 +138,6 @@ static void *salt(char *ciphertext) #if DES_BS -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - #define get_hash_0 DES_bs_get_hash_0 #define get_hash_1 DES_bs_get_hash_1 #define get_hash_2 DES_bs_get_hash_2 @@ -430,13 +395,13 @@ struct fmt_main fmt_BSDI = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/clipperz_srp_fmt_plug.c JohnTheRipper/src/clipperz_srp_fmt_plug.c --- JohnTheRipper.orig/src/clipperz_srp_fmt_plug.c 2013-06-11 18:58:52.996390352 +0000 +++ JohnTheRipper/src/clipperz_srp_fmt_plug.c 2013-06-11 19:02:29.052389903 +0000 @@ -225,13 +225,6 @@ static void *salt(char *ciphertext) return (void *)&cs; } -static int binary_hash_0(void *binary) { return *(ARCH_WORD_32 *)binary & 0xF; } -static int binary_hash_1(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFF; } -static int binary_hash_2(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFF; } -static int binary_hash_3(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFFF; } -static int binary_hash_4(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFFFF; } -static int binary_hash_5(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFFFFF; } -static int binary_hash_6(void *binary) { return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; } static int get_hash_0(int index) { return crypt_out[index][0] & 0xF; } static int get_hash_1(int index) { return crypt_out[index][0] & 0xFF; } static int get_hash_2(int index) { return crypt_out[index][0] & 0xFFF; } @@ -437,13 +430,13 @@ struct fmt_main fmt_clipperz = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/cuda_cryptsha256_fmt.c JohnTheRipper/src/cuda_cryptsha256_fmt.c --- JohnTheRipper.orig/src/cuda_cryptsha256_fmt.c 2013-06-11 18:58:52.996390352 +0000 +++ JohnTheRipper/src/cuda_cryptsha256_fmt.c 2013-06-11 19:42:28.276384940 +0000 @@ -191,41 +191,6 @@ static void *salt(char *ciphertext) return (void *) ret; } -static int binary_hash_0(void *binary) -{ - return (((ARCH_WORD_32 *) binary)[0] & 0xf); -} - -static int binary_hash_1(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xff; -} - -static int binary_hash_2(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xfff; -} - -static int binary_hash_3(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xffff; -} - -static int binary_hash_4(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xfffff; -} - -static int binary_hash_5(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xffffff; -} - -static int binary_hash_6(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0x7ffffff; -} - static void set_salt(void *salt) { unsigned char *s = salt; @@ -374,13 +339,13 @@ struct fmt_main fmt_cuda_cryptsha256 = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/cuda_cryptsha512_fmt.c JohnTheRipper/src/cuda_cryptsha512_fmt.c --- JohnTheRipper.orig/src/cuda_cryptsha512_fmt.c 2013-06-11 18:58:52.996390352 +0000 +++ JohnTheRipper/src/cuda_cryptsha512_fmt.c 2013-06-11 19:42:48.100384899 +0000 @@ -184,41 +184,6 @@ static void *salt(char *ciphertext) return (void *) ret; } -static int binary_hash_0(void *binary) -{ - return (((uint64_t *) binary)[0] & 0xf); -} - -static int binary_hash_1(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xff; -} - -static int binary_hash_2(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xfff; -} - -static int binary_hash_3(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xffff; -} - -static int binary_hash_4(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xfffff; -} - -static int binary_hash_5(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xffffff; -} - -static int binary_hash_6(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0x7ffffff; -} - static void set_salt(void *salt) { unsigned char *s = salt; @@ -363,13 +328,13 @@ struct fmt_main fmt_cuda_cryptsha512 = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/cuda_mscash2_fmt.c JohnTheRipper/src/cuda_mscash2_fmt.c --- JohnTheRipper.orig/src/cuda_mscash2_fmt.c 2013-06-11 18:58:52.996390352 +0000 +++ JohnTheRipper/src/cuda_mscash2_fmt.c 2013-06-11 19:40:41.116385162 +0000 @@ -238,36 +238,6 @@ static int binary_hash_0(void *binary) return (((uint32_t *) binary)[0] & 0xf); } -static int binary_hash_1(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xff; -} - -static int binary_hash_2(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xfff; -} - -static int binary_hash_3(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xffff; -} - -static int binary_hash_4(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xfffff; -} - -static int binary_hash_5(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xffffff; -} - -static int binary_hash_6(void *binary) -{ - return ((uint32_t *) binary)[0] & 0x7ffffff; -} - static int get_hash_0(int index) { #ifdef _MSCASH2_DEBUG @@ -361,12 +331,12 @@ struct fmt_main fmt_cuda_mscash2 = { fmt_default_source, { binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/cuda_mscash_fmt.c JohnTheRipper/src/cuda_mscash_fmt.c --- JohnTheRipper.orig/src/cuda_mscash_fmt.c 2013-06-11 18:58:52.996390352 +0000 +++ JohnTheRipper/src/cuda_mscash_fmt.c 2013-06-11 19:41:16.864385088 +0000 @@ -162,41 +162,6 @@ static int crypt_all(int *pcount, struct return count; } -static int binary_hash_0(void *binary) -{ - return (((uint32_t *) binary)[0] & 0xf); -} - -static int binary_hash_1(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xff; -} - -static int binary_hash_2(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xfff; -} - -static int binary_hash_3(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xffff; -} - -static int binary_hash_4(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xfffff; -} - -static int binary_hash_5(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xffffff; -} - -static int binary_hash_6(void *binary) -{ - return ((uint32_t *) binary)[0] & 0x7ffffff; -} - static int get_hash_0(int index) { return outbuffer[index].v[0] & 0xf; @@ -283,13 +248,13 @@ struct fmt_main fmt_cuda_mscash = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/cuda_rawsha256_fmt.c JohnTheRipper/src/cuda_rawsha256_fmt.c --- JohnTheRipper.orig/src/cuda_rawsha256_fmt.c 2013-06-11 18:58:52.996390352 +0000 +++ JohnTheRipper/src/cuda_rawsha256_fmt.c 2013-06-11 19:43:40.712384792 +0000 @@ -132,41 +132,6 @@ static void *binary(char *ciphertext) return (void *) realcipher; } -static int binary_hash_0(void *binary) -{ - return (((ARCH_WORD_32 *) binary)[0] & 0xf); -} - -static int binary_hash_1(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xff; -} - -static int binary_hash_2(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xfff; -} - -static int binary_hash_3(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xffff; -} - -static int binary_hash_4(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xfffff; -} - -static int binary_hash_5(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0xffffff; -} - -static int binary_hash_6(void *binary) -{ - return ((ARCH_WORD_32 *) binary)[0] & 0x7ffffff; -} - static void set_salt(void *salt) { } @@ -284,13 +249,13 @@ struct fmt_main FMT_MAIN = { fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/cuda_wpapsk_fmt.c JohnTheRipper/src/cuda_wpapsk_fmt.c --- JohnTheRipper.orig/src/cuda_wpapsk_fmt.c 2013-06-11 18:58:52.996390352 +0000 +++ JohnTheRipper/src/cuda_wpapsk_fmt.c 2013-06-11 19:31:45.460386270 +0000 @@ -93,12 +93,12 @@ struct fmt_main fmt_cuda_wpapsk = { fmt_default_source, { binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/DES_fmt.c JohnTheRipper/src/DES_fmt.c --- JohnTheRipper.orig/src/DES_fmt.c 2013-06-11 18:58:52.988390352 +0000 +++ JohnTheRipper/src/DES_fmt.c 2013-06-11 19:08:11.508389196 +0000 @@ -147,41 +147,6 @@ static void *salt(char *ciphertext) #if DES_BS -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - #define get_hash_0 DES_bs_get_hash_0 #define get_hash_1 DES_bs_get_hash_1 #define get_hash_2 DES_bs_get_hash_2 @@ -394,13 +359,13 @@ struct fmt_main fmt_DES = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/dynamic_fmt.c JohnTheRipper/src/dynamic_fmt.c --- JohnTheRipper.orig/src/dynamic_fmt.c 2013-06-11 18:58:53.000390352 +0000 +++ JohnTheRipper/src/dynamic_fmt.c 2013-06-11 19:18:57.272387859 +0000 @@ -1653,13 +1653,6 @@ static void crypt_all(int count) * 'normal' hashing functions *********************************************************************************/ extern char *MD5_DumpHexStr(void *p); -static int binary_hash_0(void * binary) { return ((ARCH_WORD_32 *)binary)[0] & 0xf; } -static int binary_hash_1(void * binary) { return ((ARCH_WORD_32 *)binary)[0] & 0xff; } -static int binary_hash_2(void * binary) { return ((ARCH_WORD_32 *)binary)[0] & 0xfff; } -static int binary_hash_3(void * binary) { return ((ARCH_WORD_32 *)binary)[0] & 0xffff; } -static int binary_hash_4(void * binary) { return ((ARCH_WORD_32 *)binary)[0] & 0xfffff; } -static int binary_hash_5(void * binary) { return ((ARCH_WORD_32 *)binary)[0] & 0xffffff; } -static int binary_hash_6(void * binary) { return ((ARCH_WORD_32 *)binary)[0] & 0x7ffffff; } #if !ARCH_LITTLE_ENDIAN // the lower 8 bits is zero on the binary (but filled in on the hash). We need to dump the low 8 @@ -2568,13 +2561,13 @@ static struct fmt_main fmt_Dynamic = fmt_default_source, #endif { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/hmailserver_fmt_plug.c JohnTheRipper/src/hmailserver_fmt_plug.c --- JohnTheRipper.orig/src/hmailserver_fmt_plug.c 2013-06-11 18:58:53.004390352 +0000 +++ JohnTheRipper/src/hmailserver_fmt_plug.c 2013-06-11 19:34:15.816385959 +0000 @@ -111,41 +111,6 @@ static void *salt(char *ciphertext) return out; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return crypt_out[0] & 0xF; @@ -253,13 +218,13 @@ struct fmt_main fmt_hmailserver = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/LM_fmt.c JohnTheRipper/src/LM_fmt.c --- JohnTheRipper.orig/src/LM_fmt.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/LM_fmt.c 2013-06-11 19:24:59.272387110 +0000 @@ -130,41 +130,6 @@ static char *source(char *source, void * return split(DES_bs_get_source_LM(binary), 0, NULL); } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int cmp_one(void *binary, int index) { return DES_bs_cmp_one((ARCH_WORD_32 *)binary, 64, index); @@ -224,13 +189,13 @@ struct fmt_main fmt_LM = { fmt_default_salt, source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/md4_gen_fmt_plug.c JohnTheRipper/src/md4_gen_fmt_plug.c --- JohnTheRipper.orig/src/md4_gen_fmt_plug.c 2013-06-11 18:58:53.008390352 +0000 +++ JohnTheRipper/src/md4_gen_fmt_plug.c 2013-06-11 19:36:32.232385678 +0000 @@ -98,41 +98,6 @@ static void *salt(char *ciphertext) return out; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return crypt_out[0] & 0xF; @@ -260,13 +225,13 @@ struct fmt_main fmt_md4_gen = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/MD5_fmt.c JohnTheRipper/src/MD5_fmt.c --- JohnTheRipper.orig/src/MD5_fmt.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/MD5_fmt.c 2013-06-11 19:22:48.232387381 +0000 @@ -134,41 +134,6 @@ static int valid(char *ciphertext, struc return 1; } -static int binary_hash_0(void *binary) -{ - return *(MD5_word *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(MD5_word *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(MD5_word *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(MD5_word *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(MD5_word *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(MD5_word *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(MD5_word *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { #ifdef MD5_SSE_PARA @@ -424,13 +389,13 @@ struct fmt_main fmt_MD5 = { get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/MSCHAPv2_bs_fmt_plug.c JohnTheRipper/src/MSCHAPv2_bs_fmt_plug.c --- JohnTheRipper.orig/src/MSCHAPv2_bs_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/MSCHAPv2_bs_fmt_plug.c 2013-06-11 19:32:40.904386155 +0000 @@ -529,14 +529,6 @@ static int salt_hash(void *salt) return *(ARCH_WORD_32 *)salt & (SALT_HASH_SIZE - 1); } -static int binary_hash_0(void *binary) { return *(ARCH_WORD*)binary & 0xF; } -static int binary_hash_1(void *binary) { return *(ARCH_WORD*)binary & 0xFF; } -static int binary_hash_2(void *binary) { return *(ARCH_WORD*)binary & 0xFFF; } -static int binary_hash_3(void *binary) { return *(ARCH_WORD*)binary & 0xFFFF; } -static int binary_hash_4(void *binary) { return *(ARCH_WORD*)binary & 0xFFFFF; } -static int binary_hash_5(void *binary) { return *(ARCH_WORD*)binary & 0xFFFFFF; } -static int binary_hash_6(void *binary) { return *(ARCH_WORD*)binary & 0x7FFFFFF; } - struct fmt_main fmt_MSCHAPv2_old = { { FORMAT_LABEL, @@ -570,13 +562,13 @@ struct fmt_main fmt_MSCHAPv2_old = { get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/mysql_fmt_plug.c JohnTheRipper/src/mysql_fmt_plug.c --- JohnTheRipper.orig/src/mysql_fmt_plug.c 2013-06-11 18:58:53.008390352 +0000 +++ JohnTheRipper/src/mysql_fmt_plug.c 2013-06-11 19:37:50.588385516 +0000 @@ -233,41 +233,6 @@ static int crypt_all(int *pcount, struct return count; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return crypt_key[index][0] & 0xF; @@ -331,13 +296,13 @@ struct fmt_main fmt_MYSQL_fast = fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/mysqlSHA1_fmt_plug.c JohnTheRipper/src/mysqlSHA1_fmt_plug.c --- JohnTheRipper.orig/src/mysqlSHA1_fmt_plug.c 2013-06-11 18:58:53.008390352 +0000 +++ JohnTheRipper/src/mysqlSHA1_fmt_plug.c 2013-06-11 19:36:12.448385719 +0000 @@ -295,41 +295,6 @@ static void *binary(char *ciphertext) return (void *)realcipher; } -static int binary_hash_0(void *binary) -{ - return ((ARCH_WORD_32 *)binary)[0] & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return ((ARCH_WORD_32 *)binary)[0] & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return ((ARCH_WORD_32 *)binary)[0] & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return ((ARCH_WORD_32 *)binary)[0] & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return ((ARCH_WORD_32 *)binary)[0] & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return ((ARCH_WORD_32 *)binary)[0] & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return ((ARCH_WORD_32 *)binary)[0] & 0x7FFFFFF; -} - #ifdef SHA1_SSE_PARA static int get_hash_0(int index) { @@ -444,13 +409,13 @@ struct fmt_main fmt_mysqlSHA1 = { fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/NETLM_fmt_plug.c JohnTheRipper/src/NETLM_fmt_plug.c --- JohnTheRipper.orig/src/NETLM_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/NETLM_fmt_plug.c 2013-06-11 19:28:51.596386631 +0000 @@ -308,41 +308,6 @@ static int salt_hash(void *salt) return *(ARCH_WORD_32 *)salt & (SALT_HASH_SIZE - 1); } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return *(ARCH_WORD_32 *)output[index] & 0xF; @@ -405,13 +370,13 @@ struct fmt_main fmt_NETLM = { get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/NETLMv2_fmt_plug.c JohnTheRipper/src/NETLMv2_fmt_plug.c --- JohnTheRipper.orig/src/NETLMv2_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/NETLMv2_fmt_plug.c 2013-06-11 19:13:41.972388513 +0000 @@ -386,41 +386,6 @@ static int salt_hash(void *salt) return (*(ARCH_WORD_32 *)salt+8) & (SALT_HASH_SIZE - 1); } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return *(ARCH_WORD_32 *)output[index] & 0xF; @@ -483,13 +448,13 @@ struct fmt_main fmt_NETLMv2 = { get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/NETNTLM_bs_fmt_plug.c JohnTheRipper/src/NETNTLM_bs_fmt_plug.c --- JohnTheRipper.orig/src/NETNTLM_bs_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/NETNTLM_bs_fmt_plug.c 2013-06-11 19:24:31.932387167 +0000 @@ -405,14 +405,6 @@ static int salt_hash(void *salt) return *(ARCH_WORD_32 *)salt & (SALT_HASH_SIZE - 1); } -static int binary_hash_0(void *binary) { return *(ARCH_WORD*)binary & 0xF; } -static int binary_hash_1(void *binary) { return *(ARCH_WORD*)binary & 0xFF; } -static int binary_hash_2(void *binary) { return *(ARCH_WORD*)binary & 0xFFF; } -static int binary_hash_3(void *binary) { return *(ARCH_WORD*)binary & 0xFFFF; } -static int binary_hash_4(void *binary) { return *(ARCH_WORD*)binary & 0xFFFFF; } -static int binary_hash_5(void *binary) { return *(ARCH_WORD*)binary & 0xFFFFFF; } -static int binary_hash_6(void *binary) { return *(ARCH_WORD*)binary & 0x7FFFFFF; } - struct fmt_main fmt_NETNTLM_old = { { FORMAT_LABEL, @@ -446,13 +438,13 @@ struct fmt_main fmt_NETNTLM_old = { get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/NETNTLMv2_fmt_plug.c JohnTheRipper/src/NETNTLMv2_fmt_plug.c --- JohnTheRipper.orig/src/NETNTLMv2_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/NETNTLMv2_fmt_plug.c 2013-06-11 19:20:32.624387662 +0000 @@ -453,41 +453,6 @@ static int salt_hash(void *salt) return hash & (SALT_HASH_SIZE - 1); } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return *(ARCH_WORD_32 *)output[index] & 0xF; @@ -550,13 +515,13 @@ struct fmt_main fmt_NETNTLMv2 = { get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/NETSPLITLM_fmt_plug.c JohnTheRipper/src/NETSPLITLM_fmt_plug.c --- JohnTheRipper.orig/src/NETSPLITLM_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/NETSPLITLM_fmt_plug.c 2013-06-11 19:08:35.484389145 +0000 @@ -267,41 +267,6 @@ static int salt_hash(void *salt) return *(ARCH_WORD_32 *)salt & (SALT_HASH_SIZE - 1); } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return *(ARCH_WORD_32 *)output[index] & 0xF; @@ -364,13 +329,13 @@ struct fmt_main fmt_NETHALFLM = { get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/NS_fmt_plug.c JohnTheRipper/src/NS_fmt_plug.c --- JohnTheRipper.orig/src/NS_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/NS_fmt_plug.c 2013-06-11 19:03:32.812389773 +0000 @@ -164,41 +164,6 @@ static ARCH_WORD_32 *get_binary(char *ci return out; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xf; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xff; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xfff; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xffff; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xfffff; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xffffff; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7ffffff; -} - static int get_hash_0(int index) { return crypted[0] & 0xf; @@ -318,13 +283,13 @@ struct fmt_main fmt_NS = { (void *(*)(char *))get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/opencl_wpapsk_fmt.c JohnTheRipper/src/opencl_wpapsk_fmt.c --- JohnTheRipper.orig/src/opencl_wpapsk_fmt.c 2013-06-11 18:58:53.016390352 +0000 +++ JohnTheRipper/src/opencl_wpapsk_fmt.c 2013-06-11 19:31:58.748386242 +0000 @@ -502,12 +502,12 @@ struct fmt_main fmt_opencl_wpapsk = { fmt_default_source, { binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/PO_fmt_plug.c JohnTheRipper/src/PO_fmt_plug.c --- JohnTheRipper.orig/src/PO_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/PO_fmt_plug.c 2013-06-11 19:03:52.600389732 +0000 @@ -83,41 +83,6 @@ static int valid(char *ciphertext, struc return 0; } -static int binary_hash_0(void *binary) -{ - return *(MD5_word *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(MD5_word *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(MD5_word *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(MD5_word *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(MD5_word *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(MD5_word *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(MD5_word *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return MD5_out[0] & 0xF; @@ -255,13 +220,13 @@ struct fmt_main fmt_PO = { (void *(*)(char *))get_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, (void (*)(void *))set_salt, diff -urpN JohnTheRipper.orig/src/rawBLAKE2_512_fmt_plug.c JohnTheRipper/src/rawBLAKE2_512_fmt_plug.c --- JohnTheRipper.orig/src/rawBLAKE2_512_fmt_plug.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawBLAKE2_512_fmt_plug.c 2013-06-11 19:19:19.764387814 +0000 @@ -127,41 +127,6 @@ static void *get_binary(char *ciphertext return out; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return crypt_out[index][0] & 0xF; @@ -275,13 +240,13 @@ struct fmt_main fmt_rawBLAKE2 = { fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA224_fmt_plug.c JohnTheRipper/src/rawSHA224_fmt_plug.c --- JohnTheRipper.orig/src/rawSHA224_fmt_plug.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA224_fmt_plug.c 2013-06-11 19:00:31.044390149 +0000 @@ -148,14 +148,6 @@ static void *binary(char *ciphertext) return out; } -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - #ifdef MMX_COEF_SHA256 static int get_hash_0 (int index) { return crypt_out[index>>(MMX_COEF_SHA256>>1)][index&(MMX_COEF_SHA256-1)] & 0xf; } static int get_hash_1 (int index) { return crypt_out[index>>(MMX_COEF_SHA256>>1)][index&(MMX_COEF_SHA256-1)] & 0xff; } @@ -334,13 +326,13 @@ struct fmt_main fmt_rawSHA224 = { fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA256_fmt_plug.c JohnTheRipper/src/rawSHA256_fmt_plug.c --- JohnTheRipper.orig/src/rawSHA256_fmt_plug.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA256_fmt_plug.c 2013-06-11 19:01:45.400389994 +0000 @@ -223,14 +223,6 @@ static void *binary(char *ciphertext) return out; } -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - #ifdef MMX_COEF_SHA256 static int get_hash_0 (int index) { return crypt_out[index>>(MMX_COEF_SHA256>>1)][index&(MMX_COEF_SHA256-1)] & 0xf; } static int get_hash_1 (int index) { return crypt_out[index>>(MMX_COEF_SHA256>>1)][index&(MMX_COEF_SHA256-1)] & 0xff; } @@ -409,13 +401,13 @@ struct fmt_main fmt_rawSHA256 = { fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA256_ng_fmt.c JohnTheRipper/src/rawSHA256_ng_fmt.c --- JohnTheRipper.orig/src/rawSHA256_ng_fmt.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA256_ng_fmt.c 2013-06-11 19:14:28.828388414 +0000 @@ -290,15 +290,6 @@ static void *get_binary (char *ciphertex return (void *) out; } - -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - static int get_hash_0 (int index) { return crypt_key[0][index] & 0xf; } static int get_hash_1 (int index) { return crypt_key[0][index] & 0xff; } static int get_hash_2 (int index) { return crypt_key[0][index] & 0xfff; } @@ -557,13 +548,13 @@ struct fmt_main fmt_rawSHA256_ng = { fmt_default_source, #endif { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA256_ng_i_fmt.c JohnTheRipper/src/rawSHA256_ng_i_fmt.c --- JohnTheRipper.orig/src/rawSHA256_ng_i_fmt.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA256_ng_i_fmt.c 2013-06-11 19:26:40.344386901 +0000 @@ -212,15 +212,6 @@ static void *get_binary (char *ciphertex return (void *) out; } - -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - static int get_hash_0 (int index) { return crypt_key[index>>(MMX_COEF_SHA256>>1)][index&(MMX_COEF_SHA256-1)] & 0xf; } static int get_hash_1 (int index) { return crypt_key[index>>(MMX_COEF_SHA256>>1)][index&(MMX_COEF_SHA256-1)] & 0xff; } static int get_hash_2 (int index) { return crypt_key[index>>(MMX_COEF_SHA256>>1)][index&(MMX_COEF_SHA256-1)] & 0xfff; } @@ -435,13 +426,13 @@ struct fmt_main fmt_rawSHA256_ng_i = { fmt_default_source, #endif { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA384_fmt_plug.c JohnTheRipper/src/rawSHA384_fmt_plug.c --- JohnTheRipper.orig/src/rawSHA384_fmt_plug.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA384_fmt_plug.c 2013-06-11 19:12:10.056388703 +0000 @@ -150,14 +150,6 @@ static void *binary(char *ciphertext) return out; } -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - #ifdef MMX_COEF_SHA512 static int get_hash_0 (int index) { return crypt_out[index>>(MMX_COEF_SHA512>>1)][index&(MMX_COEF_SHA512-1)] & 0xf; } static int get_hash_1 (int index) { return crypt_out[index>>(MMX_COEF_SHA512>>1)][index&(MMX_COEF_SHA512-1)] & 0xff; } @@ -358,13 +350,13 @@ struct fmt_main fmt_rawSHA384 = { fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA512_fmt_plug.c JohnTheRipper/src/rawSHA512_fmt_plug.c --- JohnTheRipper.orig/src/rawSHA512_fmt_plug.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA512_fmt_plug.c 2013-06-11 19:11:26.300388792 +0000 @@ -150,14 +150,6 @@ static void *binary(char *ciphertext) return out; } -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - #ifdef MMX_COEF_SHA512 static int get_hash_0 (int index) { return crypt_out[index>>(MMX_COEF_SHA512>>1)][index&(MMX_COEF_SHA512-1)] & 0xf; } static int get_hash_1 (int index) { return crypt_out[index>>(MMX_COEF_SHA512>>1)][index&(MMX_COEF_SHA512-1)] & 0xff; } @@ -364,13 +356,13 @@ struct fmt_main fmt_raw0_SHA512 = { fmt_default_salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA512_ng_fmt.c JohnTheRipper/src/rawSHA512_ng_fmt.c --- JohnTheRipper.orig/src/rawSHA512_ng_fmt.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA512_ng_fmt.c 2013-06-11 19:27:24.296386810 +0000 @@ -302,15 +302,6 @@ static void *get_binary (char *ciphertex return (void *) out; } - -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - static int get_hash_0 (int index) { return crypt_key[0][index] & 0xf; } static int get_hash_1 (int index) { return crypt_key[0][index] & 0xff; } static int get_hash_2 (int index) { return crypt_key[0][index] & 0xfff; } @@ -570,13 +561,13 @@ struct fmt_main fmt_rawSHA512_ng = { fmt_default_source, #endif { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/rawSHA512_ng_i_fmt.c JohnTheRipper/src/rawSHA512_ng_i_fmt.c --- JohnTheRipper.orig/src/rawSHA512_ng_i_fmt.c 2013-06-11 18:58:53.020390352 +0000 +++ JohnTheRipper/src/rawSHA512_ng_i_fmt.c 2013-06-11 19:06:39.912389384 +0000 @@ -205,15 +205,6 @@ static void *get_binary (char *ciphertex return (void *) out; } - -static int binary_hash_0 (void *binary) { return *(uint32_t *) binary & 0xf; } -static int binary_hash_1 (void *binary) { return *(uint32_t *) binary & 0xff; } -static int binary_hash_2 (void *binary) { return *(uint32_t *) binary & 0xfff; } -static int binary_hash_3 (void *binary) { return *(uint32_t *) binary & 0xffff; } -static int binary_hash_4 (void *binary) { return *(uint32_t *) binary & 0xfffff; } -static int binary_hash_5 (void *binary) { return *(uint32_t *) binary & 0xffffff; } -static int binary_hash_6 (void *binary) { return *(uint32_t *) binary & 0x7ffffff; } - static int get_hash_0 (int index) { return crypt_key[index>>(MMX_COEF_SHA512>>1)][index&(MMX_COEF_SHA512-1)] & 0xf; } static int get_hash_1 (int index) { return crypt_key[index>>(MMX_COEF_SHA512>>1)][index&(MMX_COEF_SHA512-1)] & 0xff; } static int get_hash_2 (int index) { return crypt_key[index>>(MMX_COEF_SHA512>>1)][index&(MMX_COEF_SHA512-1)] & 0xfff; } @@ -452,13 +443,13 @@ struct fmt_main fmt_rawSHA512_ng_i = { fmt_default_source, #endif { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, fmt_default_set_salt, diff -urpN JohnTheRipper.orig/src/sha1_gen_fmt_plug.c JohnTheRipper/src/sha1_gen_fmt_plug.c --- JohnTheRipper.orig/src/sha1_gen_fmt_plug.c 2013-06-11 18:58:53.024390352 +0000 +++ JohnTheRipper/src/sha1_gen_fmt_plug.c 2013-06-11 19:09:48.924388993 +0000 @@ -101,41 +101,6 @@ static void *salt(char *ciphertext) return out; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return crypt_out[0] & 0xF; @@ -264,13 +229,13 @@ struct fmt_main fmt_sha1_gen = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/SybaseASE_fmt_plug.c JohnTheRipper/src/SybaseASE_fmt_plug.c --- JohnTheRipper.orig/src/SybaseASE_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/SybaseASE_fmt_plug.c 2013-06-11 19:39:10.832385350 +0000 @@ -134,41 +134,6 @@ static void *salt(char *ciphertext) return out.u8; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return crypt_out[index][0] & 0xF; @@ -312,13 +277,13 @@ struct fmt_main fmt_SybaseASE = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, @@ -327,13 +292,13 @@ struct fmt_main fmt_SybaseASE = { fmt_default_clear_keys, crypt_all, { - get_hash_0, - get_hash_1, - get_hash_2, - get_hash_3, - get_hash_4, - get_hash_5, - get_hash_6 + get_hash_0, + get_hash_1, + get_hash_2, + get_hash_3, + get_hash_4, + get_hash_5, + get_hash_6 }, cmp_all, cmp_one, diff -urpN JohnTheRipper.orig/src/wow_srp_fmt_plug.c JohnTheRipper/src/wow_srp_fmt_plug.c --- JohnTheRipper.orig/src/wow_srp_fmt_plug.c 2013-06-11 18:58:53.036390352 +0000 +++ JohnTheRipper/src/wow_srp_fmt_plug.c 2013-06-11 19:05:46.540389495 +0000 @@ -236,13 +236,6 @@ static void *salt(char *ciphertext) return out.b; } -static int binary_hash_0(void *binary) { return *(ARCH_WORD_32 *)binary & 0xF; } -static int binary_hash_1(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFF; } -static int binary_hash_2(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFF; } -static int binary_hash_3(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFFF; } -static int binary_hash_4(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFFFF; } -static int binary_hash_5(void *binary) { return *(ARCH_WORD_32 *)binary & 0xFFFFFF; } -static int binary_hash_6(void *binary) { return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; } static int get_hash_0(int index) { return crypt_out[index][0] & 0xF; } static int get_hash_1(int index) { return crypt_out[index][0] & 0xFF; } static int get_hash_2(int index) { return crypt_out[index][0] & 0xFFF; } @@ -439,13 +432,13 @@ struct fmt_main fmt_blizzard = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/wpapsk_fmt.c JohnTheRipper/src/wpapsk_fmt.c --- JohnTheRipper.orig/src/wpapsk_fmt.c 2013-06-11 18:58:53.036390352 +0000 +++ JohnTheRipper/src/wpapsk_fmt.c 2013-06-11 19:31:05.192386353 +0000 @@ -412,12 +412,12 @@ struct fmt_main fmt_wpapsk = { fmt_default_source, { binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, fmt_default_salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/wpapsk.h JohnTheRipper/src/wpapsk.h --- JohnTheRipper.orig/src/wpapsk.h 2013-06-11 18:58:53.036390352 +0000 +++ JohnTheRipper/src/wpapsk.h 2013-06-11 19:32:00.992386238 +0000 @@ -374,36 +374,6 @@ static int binary_hash_0(void *binary) return ((uint32_t *) binary)[0] & 0xf; } -static int binary_hash_1(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xff; -} - -static int binary_hash_2(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xfff; -} - -static int binary_hash_3(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xffff; -} - -static int binary_hash_4(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xfffff; -} - -static int binary_hash_5(void *binary) -{ - return ((uint32_t *) binary)[0] & 0xffffff; -} - -static int binary_hash_6(void *binary) -{ - return ((uint32_t *) binary)[0] & 0x7ffffff; -} - static int get_hash_0(int index) { #ifdef WPAPSK_DEBUG diff -urpN JohnTheRipper.orig/src/XSHA512_fmt_plug.c JohnTheRipper/src/XSHA512_fmt_plug.c --- JohnTheRipper.orig/src/XSHA512_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/XSHA512_fmt_plug.c 2013-06-11 19:10:16.104388937 +0000 @@ -148,41 +148,6 @@ static void *salt(char *ciphertext) return out; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - static int get_hash_0(int index) { return crypt_out[index][0] & 0xF; @@ -327,13 +292,13 @@ struct fmt_main fmt_XSHA512 = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt, diff -urpN JohnTheRipper.orig/src/XSHA_fmt_plug.c JohnTheRipper/src/XSHA_fmt_plug.c --- JohnTheRipper.orig/src/XSHA_fmt_plug.c 2013-06-11 18:58:52.992390352 +0000 +++ JohnTheRipper/src/XSHA_fmt_plug.c 2013-06-11 19:34:50.720385888 +0000 @@ -155,41 +155,6 @@ static void *salt(char *ciphertext) return out; } -static int binary_hash_0(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xF; -} - -static int binary_hash_1(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFF; -} - -static int binary_hash_2(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFF; -} - -static int binary_hash_3(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFF; -} - -static int binary_hash_4(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFF; -} - -static int binary_hash_5(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0xFFFFFF; -} - -static int binary_hash_6(void *binary) -{ - return *(ARCH_WORD_32 *)binary & 0x7FFFFFF; -} - #ifdef MMX_COEF static int get_hash_0(int index) { @@ -492,13 +457,13 @@ struct fmt_main fmt_XSHA = { salt, fmt_default_source, { - binary_hash_0, - binary_hash_1, - binary_hash_2, - binary_hash_3, - binary_hash_4, - binary_hash_5, - binary_hash_6 + fmt_default_binary_hash_0, + fmt_default_binary_hash_1, + fmt_default_binary_hash_2, + fmt_default_binary_hash_3, + fmt_default_binary_hash_4, + fmt_default_binary_hash_5, + fmt_default_binary_hash_6 }, salt_hash, set_salt,