diff --git a/OpenCL/m03201-pure.cl b/OpenCL/m25600-pure.cl similarity index 99% rename from OpenCL/m03201-pure.cl rename to OpenCL/m25600-pure.cl index f7c170afd..e490679a7 100644 --- a/OpenCL/m03201-pure.cl +++ b/OpenCL/m25600-pure.cl @@ -393,7 +393,7 @@ DECLSPEC void expand_key (u32 *E, u32 *W, const int len) } } -KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03201_init (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_init (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base @@ -674,7 +674,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03201_init (KERN_ATTR_TMPS } } -KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03201_loop (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_loop (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base @@ -873,7 +873,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03201_loop (KERN_ATTR_TMPS } } -KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03201_comp (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25600_comp (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base diff --git a/docs/changes.txt b/docs/changes.txt index 371a0a65d..e4e7e6485 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,5 +1,11 @@ * changes v6.2.1 -> v6.x.x +## +## Algorithms +## + +- Added hash-mode: bcrypt(md5($pass)) / bcryptmd5 + ## ## Improvements ## @@ -54,7 +60,6 @@ - Added hash-mode: Umbraco HMAC-SHA1 - Added hash-mode: sha1($salt.sha1($pass.$salt)) - Added hash-mode: sha1(sha1($pass).$salt) -- Added hash-mode: bcrypt(md5($pass)) / bcryptmd5 ## ## Features diff --git a/src/modules/module_03201.c b/src/modules/module_25600.c similarity index 99% rename from src/modules/module_03201.c rename to src/modules/module_25600.c index 25c69dff2..77c515a16 100644 --- a/src/modules/module_03201.c +++ b/src/modules/module_25600.c @@ -18,7 +18,7 @@ static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_4_6; static const u32 HASH_CATEGORY = HASH_CATEGORY_OS; static const char *HASH_NAME = "bcrypt(md5($pass)) / bcryptmd5"; -static const u64 KERN_TYPE = 3201; +static const u64 KERN_TYPE = 25600; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_DYNAMIC_SHARED; diff --git a/tools/test_modules/m03201.pm b/tools/test_modules/m25600.pm similarity index 100% rename from tools/test_modules/m03201.pm rename to tools/test_modules/m25600.pm