diff --git a/OpenCL/m07010_a0-pure.cl b/OpenCL/m26300_a0-pure.cl similarity index 97% rename from OpenCL/m07010_a0-pure.cl rename to OpenCL/m26300_a0-pure.cl index 10c75d352..04a2ca3be 100644 --- a/OpenCL/m07010_a0-pure.cl +++ b/OpenCL/m26300_a0-pure.cl @@ -16,7 +16,7 @@ #include "inc_hash_sha256.cl" #endif -KERNEL_FQ void m07010_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m26300_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -92,7 +92,7 @@ KERNEL_FQ void m07010_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m07010_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m26300_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m07010_a1-pure.cl b/OpenCL/m26300_a1-pure.cl similarity index 97% rename from OpenCL/m07010_a1-pure.cl rename to OpenCL/m26300_a1-pure.cl index cadc253bc..95e0f3509 100644 --- a/OpenCL/m07010_a1-pure.cl +++ b/OpenCL/m26300_a1-pure.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha256.cl" #endif -KERNEL_FQ void m07010_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m26300_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -86,7 +86,7 @@ KERNEL_FQ void m07010_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m07010_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m26300_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m07010_a3-pure.cl b/OpenCL/m26300_a3-pure.cl similarity index 97% rename from OpenCL/m07010_a3-pure.cl rename to OpenCL/m26300_a3-pure.cl index fea79271d..2d8f9b149 100644 --- a/OpenCL/m07010_a3-pure.cl +++ b/OpenCL/m26300_a3-pure.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha256.cl" #endif -KERNEL_FQ void m07010_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m26300_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -103,7 +103,7 @@ KERNEL_FQ void m07010_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m07010_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m26300_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/docs/changes.txt b/docs/changes.txt index 335139c9c..a80abe10f 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -6,6 +6,7 @@ - Added hash-mode: bcrypt(md5($pass)) / bcryptmd5 - Added hash-mode: bcrypt(sha1($pass)) / bcryptsha1 +- Added hash-mode: FortiGate256 (FortiOS256) - Added hash-mode: Linux Kernel Crypto API (2.4) - Added hash-mode: MurmurHash - Added hash-mode: md5(utf16le($pass)) diff --git a/docs/readme.txt b/docs/readme.txt index cf493c1d2..d029c78c4 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -202,6 +202,7 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or - Domain Cached Credentials (DCC), MS Cache - Domain Cached Credentials 2 (DCC2), MS Cache 2 - FortiGate (FortiOS) +- FortiGate256 (FortiOS256) - ArubaOS - Juniper IVE - Juniper NetScreen/SSG (ScreenOS) diff --git a/src/modules/module_07010.c b/src/modules/module_26300.c similarity index 99% rename from src/modules/module_07010.c rename to src/modules/module_26300.c index 5a9637242..8fc013d55 100644 --- a/src/modules/module_07010.c +++ b/src/modules/module_26300.c @@ -21,7 +21,7 @@ static const u32 DGST_POS3 = 6; static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_OS; static const char *HASH_NAME = "FortiGate256 (FortiOS256)"; -static const u64 KERN_TYPE = 7010; +static const u64 KERN_TYPE = 26300; static const u32 OPTI_TYPE = OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP | OPTI_TYPE_NOT_ITERATED; @@ -51,6 +51,7 @@ u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED con { u32 pw_max = PW_MAX; + // There's no optimized kernel?! const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); if (optimized_kernel == true) diff --git a/tools/test_modules/m07010.pm b/tools/test_modules/m26300.pm similarity index 100% rename from tools/test_modules/m07010.pm rename to tools/test_modules/m26300.pm