From 91e10abaeaa939b161226d5d553c5647e77e120e Mon Sep 17 00:00:00 2001 From: philsmd Date: Wed, 12 Aug 2020 11:22:37 +0200 Subject: [PATCH] fixes #2509: use AxCrypt 1 to avoid confusion for -m 13200/13300 --- docs/changes.txt | 7 +++++++ docs/readme.txt | 4 ++-- src/modules/module_13200.c | 2 +- src/modules/module_13300.c | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index ee94d1cb0..6bdc88783 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -13,6 +13,13 @@ - Fixed too early execution of some module functions which could make use of non-final values opts_type and opti_type - Fixed internal access on module option attribute OPTS_TYPE_SUGGEST_KG with the result that it was unused +## +## Technical +## + +- Hash-Mode 13200 (AxCrypt): Changed the name to AxCrypt 1 to avoid confusion +- Hash-Mode 13300 (AxCrypt in-memory SHA1): Changed the name to AxCrypt 1 in-memory SHA1 + * changes v6.1.0 -> v6.1.1 ## diff --git a/docs/readme.txt b/docs/readme.txt index 458b162c5..c163dc3de 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -307,8 +307,8 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or - iTunes backup >= 10.0 - WinZip - Android Backup -- AxCrypt -- AxCrypt in-memory SHA1 +- AxCrypt 1 +- AxCrypt 1 in-memory SHA1 - WBB3 (Woltlab Burning Board) - vBulletin < v3.8.5 - vBulletin >= v3.8.5 diff --git a/src/modules/module_13200.c b/src/modules/module_13200.c index 62641dde1..e82bc01a2 100644 --- a/src/modules/module_13200.c +++ b/src/modules/module_13200.c @@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 2; static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_4_4; static const u32 HASH_CATEGORY = HASH_CATEGORY_ARCHIVE; -static const char *HASH_NAME = "AxCrypt"; +static const char *HASH_NAME = "AxCrypt 1"; static const u64 KERN_TYPE = 13200; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE; diff --git a/src/modules/module_13300.c b/src/modules/module_13300.c index 3a24a8e17..9fae83b87 100644 --- a/src/modules/module_13300.c +++ b/src/modules/module_13300.c @@ -17,7 +17,7 @@ static const u32 DGST_POS2 = 3; static const u32 DGST_POS3 = 2; static const u32 DGST_SIZE = DGST_SIZE_4_5; static const u32 HASH_CATEGORY = HASH_CATEGORY_ARCHIVE; -static const char *HASH_NAME = "AxCrypt in-memory SHA1"; +static const char *HASH_NAME = "AxCrypt 1 in-memory SHA1"; static const u64 KERN_TYPE = 13300; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT