Merge pull request #2514 from philsmd/axcrypt1_rename

fixes #2509: use AxCrypt 1 to avoid confusion for -m 13200/13300

docs/changes.txt

@@ -20,6 +20,13 @@
 
 - Startup time: Improved the startup time by avoiding some time intensive operations for skipped devices
 
+##
+## 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
 
 ##

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

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;

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