Merge pull request #1217 from roycewilliams/master

a few more minor hash-mode name fixes

docs/readme.txt

@@ -159,23 +159,24 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
 - OSX v10.8
 - OSX v10.9
 - OSX v10.10
-- iTunes Backup < 10.0
-- iTunes Backup >= 10.0
+- iTunes backup < 10.0
+- iTunes backup >= 10.0
 - AIX {smd5}
 - AIX {ssha1}
 - AIX {ssha256}
 - AIX {ssha512}
 - Cisco-ASA MD5
 - Cisco-PIX MD5
-- Cisco-IOS $1$ (MD5), $4$ (SHA256)
+- Cisco-IOS $1$ (MD5)
+- Cisco-IOS type 4 (SHA256)
 - Cisco $8$ (PBKDF2-SHA256)
 - Cisco $9$ (scrypt)
 - Juniper IVE
 - Juniper NetScreen/SSG (ScreenOS)
 - Juniper/NetBSD sha1crypt
 - Fortigate (FortiOS)
-- Android PIN
-- Windows 8+ phone PIN/password
+- Samsung Android Password/PIN
+- Windows Phone 8+ PIN/password
 - GRUB 2
 - CRC32
 - RACF

src/interface.c

@@ -144,8 +144,8 @@ static const char HT_05300[] = "IKE-PSK MD5";
 static const char HT_05400[] = "IKE-PSK SHA1";
 static const char HT_05500[] = "NetNTLMv1 / NetNTLMv1+ESS";
 static const char HT_05600[] = "NetNTLMv2";
-static const char HT_05700[] = "Cisco-IOS $4$ (SHA256)";
-static const char HT_05800[] = "Android PIN";
+static const char HT_05700[] = "Cisco-IOS type 4 (SHA256)";
+static const char HT_05800[] = "Samsung Android Password/PIN";
 static const char HT_06000[] = "RIPEMD-160";
 static const char HT_06100[] = "Whirlpool";
 static const char HT_06300[] = "AIX {smd5}";
@@ -227,14 +227,14 @@ static const char HT_13300[] = "AxCrypt in-memory SHA1";
 static const char HT_13400[] = "KeePass 1 (AES/Twofish) and KeePass 2 (AES)";
 static const char HT_13500[] = "PeopleSoft PS_TOKEN";
 static const char HT_13600[] = "WinZip";
-static const char HT_13800[] = "Windows 8+ phone PIN/password";
+static const char HT_13800[] = "Windows Phone 8+ PIN/password";
 static const char HT_13900[] = "OpenCart";
 static const char HT_14000[] = "DES (PT = $salt, key = $pass)";
 static const char HT_14100[] = "3DES (PT = $salt, key = $pass)";
 static const char HT_14400[] = "sha1(CX)";
 static const char HT_14600[] = "LUKS";
-static const char HT_14700[] = "iTunes Backup < 10.0";
-static const char HT_14800[] = "iTunes Backup >= 10.0";
+static const char HT_14700[] = "iTunes backup < 10.0";
+static const char HT_14800[] = "iTunes backup >= 10.0";
 static const char HT_14900[] = "Skip32 (PT = $salt, key = $pass)";
 static const char HT_15000[] = "FileZilla Server >= 0.9.55";
 static const char HT_15100[] = "Juniper/NetBSD sha1crypt";

src/usage.c

@@ -255,15 +255,15 @@ static const char *USAGE_BIG[] =
   "   2400 | Cisco-PIX MD5                                    | Operating Systems",
   "   2410 | Cisco-ASA MD5                                    | Operating Systems",
   "    500 | Cisco-IOS $1$ (MD5)                              | Operating Systems",
-  "   5700 | Cisco-IOS $4$ (SHA256)                           | Operating Systems",
+  "   5700 | Cisco-IOS type 4 (SHA256)                        | Operating Systems",
   "   9200 | Cisco-IOS $8$ (PBKDF2-SHA256)                    | Operating Systems",
   "   9300 | Cisco-IOS $9$ (scrypt)                           | Operating Systems",
   "     22 | Juniper NetScreen/SSG (ScreenOS)                 | Operating Systems",
   "    501 | Juniper IVE                                      | Operating Systems",
   "  15100 | Juniper/NetBSD sha1crypt                         | Operating Systems",
   "   7000 | FortiGate (FortiOS)                              | Operating Systems",
-  "   5800 | Android PIN                                      | Operating Systems",
-  "  13800 | Windows 8+ phone PIN/password                    | Operating Systems",
+  "   5800 | Samsung Android Password/PIN                     | Operating Systems",
+  "  13800 | Windows Phone 8+ PIN/password                    | Operating Systems",
   "   8100 | Citrix NetScaler                                 | Operating Systems",
   "   8500 | RACF                                             | Operating Systems",
   "   7200 | GRUB 2                                           | Operating Systems",
@@ -283,8 +283,8 @@ static const char *USAGE_BIG[] =
   "  13200 | AxCrypt                                          | Archives",
   "  13300 | AxCrypt in-memory SHA1                           | Archives",
   "  13600 | WinZip                                           | Archives",
-  "  14700 | iTunes Backup < 10.0                             | Backup",
-  "  14800 | iTunes Backup >= 10.0                            | Backup",
+  "  14700 | iTunes backup < 10.0                             | Backup",
+  "  14800 | iTunes backup >= 10.0                            | Backup",
   "   62XY | TrueCrypt                                        | Full-Disk Encryption (FDE)",
   "     X  | 1 = PBKDF2-HMAC-RIPEMD160                        | Full-Disk Encryption (FDE)",
   "     X  | 2 = PBKDF2-HMAC-SHA512                           | Full-Disk Encryption (FDE)",