diff -urpN jumbo-bleed0/src/dynamic_preloads.c jumbo-bleeding/src/dynamic_preloads.c --- jumbo-bleed0/src/dynamic_preloads.c 2012-06-19 00:28:33.703125000 +0000 +++ jumbo-bleeding/src/dynamic_preloads.c 2012-06-19 00:42:23.937500000 +0000 @@ -865,45 +865,45 @@ static DYNAMIC_Constants _ConstDefault[] // Here are the 'prebuilt' dynamic objects, ready to be 'loaded' static DYNAMIC_Setup Setups[] = { - { "dynamic_0: md5($p) (raw-md5) ", _Funcs_0, _Preloads_0, _ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT|MGF_GET_SOURCE }, + { "dynamic_0: md5($p) (raw-md5)", _Funcs_0, _Preloads_0, _ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT|MGF_GET_SOURCE }, #if defined (MMX_COEF) - { "dynamic_1: md5($p.$s) (joomla) ", _Funcs_1, _Preloads_1, _ConstDefault, MGF_SALTED, MGF_NO_FLAG, -32, 23 }, + { "dynamic_1: md5($p.$s) (joomla)", _Funcs_1, _Preloads_1, _ConstDefault, MGF_SALTED, MGF_NO_FLAG, -32, 23 }, #else - { "dynamic_1: md5($p.$s) (joomla) ", _Funcs_1, _Preloads_1, _ConstDefault, MGF_SALTED }, + { "dynamic_1: md5($p.$s) (joomla)", _Funcs_1, _Preloads_1, _ConstDefault, MGF_SALTED }, #endif - { "dynamic_2: md5(md5($p)) (e107) ", _Funcs_2, _Preloads_2, _ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT|MGF_SET_INP2LEN32 }, - { "dynamic_3: md5(md5(md5($p))) ", _Funcs_3, _Preloads_3, _ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT|MGF_SET_INP2LEN32 }, + { "dynamic_2: md5(md5($p)) (e107)", _Funcs_2, _Preloads_2, _ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT|MGF_SET_INP2LEN32 }, + { "dynamic_3: md5(md5(md5($p)))", _Funcs_3, _Preloads_3, _ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT|MGF_SET_INP2LEN32 }, #if defined (MMX_COEF) - { "dynamic_4: md5($s.$p) (OSC) ", _Funcs_4, _Preloads_4, _ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 }, - { "dynamic_5: md5($s.$p.$s) ", _Funcs_5, _Preloads_5, _ConstDefault, MGF_SALTED, MGF_NO_FLAG, -12, 31 }, - { "dynamic_6: md5(md5($p).$s) ", _Funcs_6, _Preloads_6, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1, -23 }, + { "dynamic_4: md5($s.$p) (OSC)", _Funcs_4, _Preloads_4, _ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 }, + { "dynamic_5: md5($s.$p.$s)", _Funcs_5, _Preloads_5, _ConstDefault, MGF_SALTED, MGF_NO_FLAG, -12, 31 }, + { "dynamic_6: md5(md5($p).$s)", _Funcs_6, _Preloads_6, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1, -23 }, #else - { "dynamic_4: md5($s.$p) (OSC) ", _Funcs_4, _Preloads_4, _ConstDefault, MGF_SALTED }, - { "dynamic_5: md5($s.$p.$s) ", _Funcs_5, _Preloads_5, _ConstDefault, MGF_SALTED }, - { "dynamic_6: md5(md5($p).$s) ", _Funcs_6, _Preloads_6, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1 }, -#endif - { "dynamic_7: md5(md5($p).$s) (vBulletin) ", _Funcs_7, _Preloads_7, _ConstDefault, MGF_SALTED|MGF_ColonNOTValid, MGF_KEYS_BASE16_IN1, 3 }, - { "dynamic_8: md5(md5($s).$p) ", _Funcs_8, _Preloads_8, _ConstDefault, MGF_SALTED|MGF_SALT_AS_HEX, MGF_NO_FLAG, -1, 23}, -#if defined (MMX_COEF) - { "dynamic_9: md5($s.md5($p)) ", _Funcs_9, _Preloads_9, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1, -23 }, - { "dynamic_10: md5($s.md5($s.$p)) ", _Funcs_10,_Preloads_10,_ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 }, - { "dynamic_11: md5($s.md5($p.$s)) ", _Funcs_11,_Preloads_11,_ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 }, + { "dynamic_4: md5($s.$p) (OSC)", _Funcs_4, _Preloads_4, _ConstDefault, MGF_SALTED }, + { "dynamic_5: md5($s.$p.$s)", _Funcs_5, _Preloads_5, _ConstDefault, MGF_SALTED }, + { "dynamic_6: md5(md5($p).$s)", _Funcs_6, _Preloads_6, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1 }, +#endif + { "dynamic_7: md5(md5($p).$s) (vBulletin)", _Funcs_7, _Preloads_7, _ConstDefault, MGF_SALTED|MGF_ColonNOTValid, MGF_KEYS_BASE16_IN1, 3 }, + { "dynamic_8: md5(md5($s).$p)", _Funcs_8, _Preloads_8, _ConstDefault, MGF_SALTED|MGF_SALT_AS_HEX, MGF_NO_FLAG, -1, 23}, +#if defined (MMX_COEF) + { "dynamic_9: md5($s.md5($p))", _Funcs_9, _Preloads_9, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1, -23 }, + { "dynamic_10: md5($s.md5($s.$p))", _Funcs_10,_Preloads_10,_ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 }, + { "dynamic_11: md5($s.md5($p.$s))", _Funcs_11,_Preloads_11,_ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 }, #else - { "dynamic_9: md5($s.md5($p)) ", _Funcs_9, _Preloads_9, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1 }, - { "dynamic_10: md5($s.md5($s.$p)) ", _Funcs_10,_Preloads_10,_ConstDefault, MGF_SALTED }, - { "dynamic_11: md5($s.md5($p.$s)) ", _Funcs_11,_Preloads_11,_ConstDefault, MGF_SALTED }, + { "dynamic_9: md5($s.md5($p))", _Funcs_9, _Preloads_9, _ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1 }, + { "dynamic_10: md5($s.md5($s.$p))", _Funcs_10,_Preloads_10,_ConstDefault, MGF_SALTED }, + { "dynamic_11: md5($s.md5($p.$s))", _Funcs_11,_Preloads_11,_ConstDefault, MGF_SALTED }, #endif - { "dynamic_12: md5(md5($s).md5($p)) (IPB) ", _Funcs_12,_Preloads_12,_ConstDefault, MGF_SALTED|MGF_SALT_AS_HEX, MGF_KEYS_BASE16_X86_IN1_Offset32 }, - { "dynamic_13: md5(md5($p).md5($s)) ", _Funcs_13,_Preloads_13,_ConstDefault, MGF_SALTED|MGF_SALT_AS_HEX, MGF_KEYS_BASE16_X86_IN1 }, + { "dynamic_12: md5(md5($s).md5($p)) (IPB)", _Funcs_12,_Preloads_12,_ConstDefault, MGF_SALTED|MGF_SALT_AS_HEX, MGF_KEYS_BASE16_X86_IN1_Offset32 }, + { "dynamic_13: md5(md5($p).md5($s))", _Funcs_13,_Preloads_13,_ConstDefault, MGF_SALTED|MGF_SALT_AS_HEX, MGF_KEYS_BASE16_X86_IN1 }, #if defined (MMX_COEF) - { "dynamic_14: md5($s.md5($p).$s) ", _Funcs_14,_Preloads_14,_ConstDefault, MGF_SALTED,MGF_KEYS_CRYPT_IN2, -12 }, + { "dynamic_14: md5($s.md5($p).$s)", _Funcs_14,_Preloads_14,_ConstDefault, MGF_SALTED,MGF_KEYS_CRYPT_IN2, -12 }, #else - { "dynamic_14: md5($s.md5($p).$s) ", _Funcs_14,_Preloads_14,_ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1 }, + { "dynamic_14: md5($s.md5($p).$s)", _Funcs_14,_Preloads_14,_ConstDefault, MGF_SALTED, MGF_KEYS_BASE16_IN1 }, #endif - { "dynamic_15: md5($u.md5($p).$s) ", _Funcs_15,_Preloads_15,_ConstDefault, MGF_SALTED|MGF_USERNAME|MGF_NOTSSE2Safe, MGF_KEYS_CRYPT_IN2, -26, 32 }, // 26 is 12+12+2 so 24+52 'fits' - { "dynamic_16: md5(md5(md5($p).$s).$s2) ", _Funcs_16,_Preloads_16,_ConstDefault, MGF_SALTED|MGF_SALTED2|MGF_NOTSSE2Safe, MGF_KEYS_BASE16_IN1, -26, 32 }, + { "dynamic_15: md5($u.md5($p).$s)", _Funcs_15,_Preloads_15,_ConstDefault, MGF_SALTED|MGF_USERNAME|MGF_NOTSSE2Safe, MGF_KEYS_CRYPT_IN2, -26, 32 }, // 26 is 12+12+2 so 24+52 'fits' + { "dynamic_16: md5(md5(md5($p).$s).$s2)", _Funcs_16,_Preloads_16,_ConstDefault, MGF_SALTED|MGF_SALTED2|MGF_NOTSSE2Safe, MGF_KEYS_BASE16_IN1, -26, 32 }, { "dynamic_17: phpass ($P$ or $H$) ", _Funcs_17,_Preloads_17,_ConstDefault, MGF_SALTED|MGF_INPBASE64, MGF_PHPassSetup, 9, 38 }, - { "dynamic_18: md5($s.Y.$p.0xF7.$s) (Post.Office MD5) ", _Funcs_18,_Preloads_18,_Const_18, MGF_SALTED|MGF_NOTSSE2Safe, MGF_POSetup, 32, 32 }, + { "dynamic_18: md5($s.Y.$p.0xF7.$s)(Post.Office MD5)", _Funcs_18,_Preloads_18,_Const_18, MGF_SALTED|MGF_NOTSSE2Safe, MGF_POSetup, 32, 32 }, { "dynamic_19: Cisco PIX (MD5)", _Funcs_19,_Preloads_19,_ConstDefault, MGF_INPBASE64_4x6, MGF_NO_FLAG, 0, 16 }, { "dynamic_20: Cisco PIX (MD5 salted)", _Funcs_20,_Preloads_20,_ConstDefault, MGF_INPBASE64_4x6|MGF_SALTED, MGF_NO_FLAG, 4, 12 }, { "dynamic_21: HTTP Digest Access Auth", _Funcs_21,_Preloads_21,_Const_21, MGF_HDAA_SALT|MGF_FLD2|MGF_FLD3|MGF_SALTED, MGF_NO_FLAG, 0, 26 }, @@ -921,7 +921,7 @@ static DYNAMIC_Setup Setups[] = #else { "dynamic_29: md5(unicode($p))", _Funcs_29,_Preloads_29,_ConstDefault, MGF_UTF8, MGF_NO_FLAG, 0, 40 }, // if we are in utf8 mode, we triple this in the init() call #endif - { "dynamic_30: md4($p) (raw-md4) ", _Funcs_30,_Preloads_30,_ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT }, + { "dynamic_30: md4($p) (raw-md4)", _Funcs_30,_Preloads_30,_ConstDefault, MGF_NO_FLAG, MGF_KEYS_INPUT }, #if defined (MMX_COEF) { "dynamic_31: md4($s.$p)", _Funcs_31,_Preloads_31,_ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 }, { "dynamic_32: md4($p.$s)", _Funcs_32,_Preloads_32,_ConstDefault, MGF_SALTED, MGF_NO_FLAG, -24, 31 },