From 8620e4113f68a35ee71a2d7e53e074b5a58f71e3 Mon Sep 17 00:00:00 2001 From: Royce Williams Date: Mon, 3 Apr 2017 06:55:35 -0800 Subject: [PATCH 1/4] a few minor hash-mode name fixes --- src/interface.c | 6 +++--- src/usage.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/interface.c b/src/interface.c index be74d7e5b..8c3a1b166 100644 --- a/src/interface.c +++ b/src/interface.c @@ -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"; diff --git a/src/usage.c b/src/usage.c index 0cea1ef2c..5b2540bd7 100644 --- a/src/usage.c +++ b/src/usage.c @@ -263,7 +263,7 @@ static const char *USAGE_BIG[] = " 15100 | Juniper/NetBSD sha1crypt | Operating Systems", " 7000 | FortiGate (FortiOS) | Operating Systems", " 5800 | Android PIN | Operating Systems", - " 13800 | Windows 8+ phone PIN/password | 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)", From 98605cc316e150f967cc3c71d43b1649fe1cb62d Mon Sep 17 00:00:00 2001 From: Royce Williams Date: Mon, 3 Apr 2017 06:59:04 -0800 Subject: [PATCH 2/4] a few more minor hash-mode name fixes --- docs/readme.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/readme.txt b/docs/readme.txt index ceb40913d..d273fc8b9 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -159,8 +159,8 @@ 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} @@ -175,7 +175,7 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later) - Juniper/NetBSD sha1crypt - Fortigate (FortiOS) - Android PIN -- Windows 8+ phone PIN/password +- Windows Phone 8+ PIN/password - GRUB 2 - CRC32 - RACF From 4a393cacf61b09d84e0d68bc71b72ceedcab9e95 Mon Sep 17 00:00:00 2001 From: Royce Williams Date: Tue, 4 Apr 2017 05:03:01 -0800 Subject: [PATCH 3/4] 5800 is Samsung only --- src/interface.c | 2 +- src/usage.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/interface.c b/src/interface.c index 8c3a1b166..c9f6d179d 100644 --- a/src/interface.c +++ b/src/interface.c @@ -145,7 +145,7 @@ 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_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}"; diff --git a/src/usage.c b/src/usage.c index 5b2540bd7..5b7ca643c 100644 --- a/src/usage.c +++ b/src/usage.c @@ -262,7 +262,7 @@ static const char *USAGE_BIG[] = " 501 | Juniper IVE | Operating Systems", " 15100 | Juniper/NetBSD sha1crypt | Operating Systems", " 7000 | FortiGate (FortiOS) | Operating Systems", - " 5800 | Android PIN | 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", From b668aa2a81486ccfbd66cfa4990b433a2cd6e69a Mon Sep 17 00:00:00 2001 From: Royce Williams Date: Tue, 4 Apr 2017 05:14:08 -0800 Subject: [PATCH 4/4] label for 5700 Cisco type 4; update readme.txt --- docs/readme.txt | 5 +++-- src/interface.c | 2 +- src/usage.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/readme.txt b/docs/readme.txt index d273fc8b9..1e3f1fb53 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -167,14 +167,15 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later) - 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 +- Samsung Android Password/PIN - Windows Phone 8+ PIN/password - GRUB 2 - CRC32 diff --git a/src/interface.c b/src/interface.c index c9f6d179d..1bdda074f 100644 --- a/src/interface.c +++ b/src/interface.c @@ -144,7 +144,7 @@ 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_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"; diff --git a/src/usage.c b/src/usage.c index 5b7ca643c..407807216 100644 --- a/src/usage.c +++ b/src/usage.c @@ -255,7 +255,7 @@ 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",