diff --git a/OpenCL/m03202-pure.cl b/OpenCL/m25800-pure.cl similarity index 99% rename from OpenCL/m03202-pure.cl rename to OpenCL/m25800-pure.cl index dbb75624c..4205d12a0 100644 --- a/OpenCL/m03202-pure.cl +++ b/OpenCL/m25800-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) m03202_init (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_init (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base @@ -677,7 +677,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03202_init (KERN_ATTR_TMPS } } -KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03202_loop (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_loop (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base @@ -876,7 +876,7 @@ KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03202_loop (KERN_ATTR_TMPS } } -KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m03202_comp (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void FIXED_THREAD_COUNT(FIXED_LOCAL_SIZE) m25800_comp (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base diff --git a/docs/changes.txt b/docs/changes.txt index 5de03d6fc..55ab519ce 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -5,6 +5,7 @@ ## - Added hash-mode: bcrypt(md5($pass)) / bcryptmd5 +- Added hash-mode: bcrypt(sha1($pass)) / bcryptsha1 - Added hash-mode: Linux Kernel Crypto API (2.4) - Added hash-mode: MurmurHash @@ -62,7 +63,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(sha1($pass)) / bcryptsha1 ## ## Features diff --git a/src/modules/module_03202.c b/src/modules/module_25800.c similarity index 99% rename from src/modules/module_03202.c rename to src/modules/module_25800.c index 882f24479..423cfc5ab 100644 --- a/src/modules/module_03202.c +++ b/src/modules/module_25800.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(sha1($pass)) / bcryptsha1"; -static const u64 KERN_TYPE = 3202; +static const u64 KERN_TYPE = 25800; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_BE | OPTS_TYPE_DYNAMIC_SHARED; diff --git a/tools/test_modules/m03202.pm b/tools/test_modules/m25800.pm similarity index 100% rename from tools/test_modules/m03202.pm rename to tools/test_modules/m25800.pm