github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2024-11-02 20:39:22 +01:00
Code Releases Activity

clarify and standardize hash-mode names

Browse Source
This commit is contained in:
Royce Williams 2017-04-03 00:16:56 -08:00
parent 9074693e6f
commit 46b83926fa
3 changed files with 130 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
docs/readme.txt
View File

@ -48,7 +48,7 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
- SHA-3 (Keccak) - SHA-3 (Keccak)
- SipHash - SipHash
- Skip32 - Skip32
- RipeMD160 - RIPEMD-160
- Whirlpool - Whirlpool
- DES (PT = $salt, key = $pass) - DES (PT = $salt, key = $pass)
- 3DES (PT = $salt, key = $pass) - 3DES (PT = $salt, key = $pass)
@ -98,21 +98,21 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
- PBKDF2-HMAC-SHA512 - PBKDF2-HMAC-SHA512
- MyBB - MyBB
- phpBB3 - phpBB3
- SMF - SMF (Simple Machines Forum)
- vBulletin - vBulletin
- IPB - IPB (Invision Power Board)
- Woltlab Burning Board - WBB (Woltlab Burning Board)
- osCommerce - osCommerce
- xt:Commerce - xt:Commerce
- PrestaShop - PrestaShop
- Mediawiki B type - MediaWiki B type
- Wordpress - WordPress
- Drupal - Drupal 7
- Joomla - Joomla
- PHPS - PHPS
- Django (SHA-1) - Django (SHA-1)
- Django (PBKDF2-SHA256) - Django (PBKDF2-SHA256)
- EPiServer - Episerver
- ColdFusion 10+ - ColdFusion 10+
- Apache MD5-APR - Apache MD5-APR
- MySQL - MySQL
@ -127,14 +127,14 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
- IKE-PSK - IKE-PSK
- IPMI2 RAKP - IPMI2 RAKP
- iSCSI CHAP - iSCSI CHAP
- Cram MD5 - CRAM-MD5
- MySQL Challenge-Response Authentication (SHA1) - MySQL CRAM (SHA1)
- PostgreSQL Challenge-Response Authentication (MD5) - PostgreSQL CRAM (MD5)
- SIP Digest Authentication (MD5) - SIP digest authentication (MD5)
- WPA - WPA
- WPA2 - WPA2
- NetNTLMv1 - NetNTLMv1
- NetNTLMv1 + ESS - NetNTLMv1+ESS
- NetNTLMv2 - NetNTLMv2
- Kerberos 5 AS-REQ Pre-Auth etype 23 - Kerberos 5 AS-REQ Pre-Auth etype 23
- Kerberos 5 TGS-REP etype 23 - Kerberos 5 TGS-REP etype 23
@ -165,17 +165,17 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
- AIX {ssha1} - AIX {ssha1}
- AIX {ssha256} - AIX {ssha256}
- AIX {ssha512} - AIX {ssha512}
- Cisco-ASA - Cisco-ASA MD5
- Cisco-PIX - Cisco-PIX MD5
- Cisco-IOS - Cisco-IOS $1$ (MD5), $4$ (SHA256)
- Cisco $8$ - Cisco $8$ (PBKDF2-SHA256)
- Cisco $9$ - Cisco $9$ (scrypt)
- Juniper IVE - Juniper IVE
- Juniper Netscreen/SSG (ScreenOS) - Juniper NetScreen/SSG (ScreenOS)
- Juniper/NetBSD sha1crypt - Juniper/NetBSD sha1crypt
- Fortigate (FortiOS) - Fortigate (FortiOS)
- Android PIN - Android PIN
- Windows 8+ phone PIN/Password - Windows 8+ phone PIN/password
- GRUB 2 - GRUB 2
- CRC32 - CRC32
- RACF - RACF
@ -184,7 +184,7 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
- PunBB - PunBB
- OpenCart - OpenCart
- Atlassian (PBKDF2-HMAC-SHA1) - Atlassian (PBKDF2-HMAC-SHA1)
- Citrix Netscaler - Citrix NetScaler
- SAP CODVN B (BCODE) - SAP CODVN B (BCODE)
- SAP CODVN F/G (PASSCODE) - SAP CODVN F/G (PASSCODE)
- SAP CODVN H (PWDSALTEDHASH) iSSHA-1 - SAP CODVN H (PWDSALTEDHASH) iSSHA-1
@ -196,7 +196,7 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
- RAR3-hp - RAR3-hp
- RAR5 - RAR5
- AxCrypt - AxCrypt
- AxCrypt in memory SHA1 - AxCrypt in-memory SHA1
- PDF 1.1 - 1.3 (Acrobat 2 - 4) - PDF 1.1 - 1.3 (Acrobat 2 - 4)
- PDF 1.4 - 1.6 (Acrobat 5 - 8) - PDF 1.4 - 1.6 (Acrobat 5 - 8)
- PDF 1.7 Level 3 (Acrobat 9) - PDF 1.7 Level 3 (Acrobat 9)
@ -213,17 +213,17 @@ NVIDIA GPUS require "NVIDIA Driver" (367.x or later)
- Blockchain, My Wallet - Blockchain, My Wallet
- 1Password, agilekeychain - 1Password, agilekeychain
- 1Password, cloudkeychain - 1Password, cloudkeychain
- Lastpass - LastPass
- Password Safe v2 - Password Safe v2
- Password Safe v3 - Password Safe v3
- Keepass 1 (AES/Twofish) and Keepass 2 (AES) - KeePass 1 (AES/Twofish) and KeePass 2 (AES)
- Plaintext
- eCryptfs - eCryptfs
- Android FDE <= 4.3 - Android FDE <= 4.3
- Android FDE (Samsung DEK) - Android FDE (Samsung DEK)
- TrueCrypt - TrueCrypt
- VeraCrypt - VeraCrypt
- LUKS - LUKS
- Plaintext
## ##
## Attack-Modes ## Attack-Modes

136
src/interface.c
View File

@ -92,31 +92,30 @@ static const char HT_00150[] = "HMAC-SHA1 (key = $pass)";
static const char HT_00160[] = "HMAC-SHA1 (key = $salt)"; static const char HT_00160[] = "HMAC-SHA1 (key = $salt)";
static const char HT_00200[] = "MySQL323"; static const char HT_00200[] = "MySQL323";
static const char HT_00300[] = "MySQL4.1/MySQL5"; static const char HT_00300[] = "MySQL4.1/MySQL5";
static const char HT_00400[] = "phpass, MD5(Wordpress), MD5(phpBB3), MD5(Joomla)"; static const char HT_00400[] = "phpass, WordPress (MD5), phpBB3 (MD5), Joomla (MD5)";
static const char HT_00500[] = "md5crypt, MD5(Unix), FreeBSD MD5, Cisco-IOS MD5"; static const char HT_00500[] = "md5crypt, MD5 (Unix), Cisco-IOS $1$ (MD5)";
static const char HT_00501[] = "Juniper IVE"; static const char HT_00501[] = "Juniper IVE";
static const char HT_00900[] = "MD4"; static const char HT_00900[] = "MD4";
static const char HT_00910[] = "md4($pass.$salt)";
static const char HT_01000[] = "NTLM"; static const char HT_01000[] = "NTLM";
static const char HT_01100[] = "Domain Cached Credentials (DCC), MS Cache"; static const char HT_01100[] = "Domain Cached Credentials (DCC), MS Cache";
static const char HT_01300[] = "SHA224"; static const char HT_01300[] = "SHA-224";
static const char HT_01400[] = "SHA256"; static const char HT_01400[] = "SHA-256";
static const char HT_01410[] = "sha256($pass.$salt)"; static const char HT_01410[] = "sha256($pass.$salt)";
static const char HT_01420[] = "sha256($salt.$pass)"; static const char HT_01420[] = "sha256($salt.$pass)";
static const char HT_01430[] = "sha256(unicode($pass).$salt)"; static const char HT_01430[] = "sha256(unicode($pass).$salt)";
static const char HT_01440[] = "sha256($salt.$pass)"; static const char HT_01440[] = "sha256($salt.unicode($pass))";
static const char HT_01450[] = "HMAC-SHA256 (key = $pass)"; static const char HT_01450[] = "HMAC-SHA256 (key = $pass)";
static const char HT_01460[] = "HMAC-SHA256 (key = $salt)"; static const char HT_01460[] = "HMAC-SHA256 (key = $salt)";
static const char HT_01500[] = "descrypt, DES(Unix), Traditional DES"; static const char HT_01500[] = "descrypt, DES (Unix), Traditional DES";
static const char HT_01600[] = "md5apr1, MD5(APR), Apache MD5"; static const char HT_01600[] = "Apache $apr1$ MD5, md5apr1, MD5 (APR)";
static const char HT_01700[] = "SHA512"; static const char HT_01700[] = "SHA-512";
static const char HT_01710[] = "sha512($pass.$salt)"; static const char HT_01710[] = "sha512($pass.$salt)";
static const char HT_01720[] = "sha512($salt.$pass)"; static const char HT_01720[] = "sha512($salt.$pass)";
static const char HT_01730[] = "sha512(unicode($pass).$salt)"; static const char HT_01730[] = "sha512(unicode($pass).$salt)";
static const char HT_01740[] = "sha512($salt.unicode($pass))"; static const char HT_01740[] = "sha512($salt.unicode($pass))";
static const char HT_01750[] = "HMAC-SHA512 (key = $pass)"; static const char HT_01750[] = "HMAC-SHA512 (key = $pass)";
static const char HT_01760[] = "HMAC-SHA512 (key = $salt)"; static const char HT_01760[] = "HMAC-SHA512 (key = $salt)";
static const char HT_01800[] = "sha512crypt, SHA512(Unix)"; static const char HT_01800[] = "sha512crypt $6$, SHA512 (Unix)";
static const char HT_02100[] = "Domain Cached Credentials 2 (DCC2), MS Cache 2"; static const char HT_02100[] = "Domain Cached Credentials 2 (DCC2), MS Cache 2";
static const char HT_02400[] = "Cisco-PIX MD5"; static const char HT_02400[] = "Cisco-PIX MD5";
static const char HT_02410[] = "Cisco-ASA MD5"; static const char HT_02410[] = "Cisco-ASA MD5";
@ -124,9 +123,9 @@ static const char HT_02500[] = "WPA/WPA2";
static const char HT_02600[] = "md5(md5($pass))"; static const char HT_02600[] = "md5(md5($pass))";
static const char HT_03000[] = "LM"; static const char HT_03000[] = "LM";
static const char HT_03100[] = "Oracle H: Type (Oracle 7+)"; static const char HT_03100[] = "Oracle H: Type (Oracle 7+)";
static const char HT_03200[] = "bcrypt, Blowfish(OpenBSD)"; static const char HT_03200[] = "bcrypt $2*$, Blowfish (Unix)";
static const char HT_03710[] = "md5($salt.md5($pass))"; static const char HT_03710[] = "md5($salt.md5($pass))";
static const char HT_03711[] = "Mediawiki B type"; static const char HT_03711[] = "MediaWiki B type";
static const char HT_03800[] = "md5($salt.$pass.$salt)"; static const char HT_03800[] = "md5($salt.$pass.$salt)";
static const char HT_03910[] = "md5(md5($pass).md5($salt))"; static const char HT_03910[] = "md5(md5($pass).md5($salt))";
static const char HT_04010[] = "md5($salt.md5($salt.$pass))"; static const char HT_04010[] = "md5($salt.md5($salt.$pass))";
@ -136,31 +135,31 @@ static const char HT_04400[] = "md5(sha1($pass))";
static const char HT_04500[] = "sha1(sha1($pass))"; static const char HT_04500[] = "sha1(sha1($pass))";
static const char HT_04520[] = "sha1($salt.sha1($pass))"; static const char HT_04520[] = "sha1($salt.sha1($pass))";
static const char HT_04700[] = "sha1(md5($pass))"; static const char HT_04700[] = "sha1(md5($pass))";
static const char HT_04800[] = "MD5(Chap), iSCSI CHAP authentication"; static const char HT_04800[] = "iSCSI CHAP authentication, MD5(CHAP)";
static const char HT_04900[] = "sha1($salt.$pass.$salt)"; static const char HT_04900[] = "sha1($salt.$pass.$salt)";
static const char HT_05000[] = "SHA-3(Keccak)"; static const char HT_05000[] = "SHA-3 (Keccak)";
static const char HT_05100[] = "Half MD5"; static const char HT_05100[] = "Half MD5";
static const char HT_05200[] = "Password Safe v3"; static const char HT_05200[] = "Password Safe v3";
static const char HT_05300[] = "IKE-PSK MD5"; static const char HT_05300[] = "IKE-PSK MD5";
static const char HT_05400[] = "IKE-PSK SHA1"; static const char HT_05400[] = "IKE-PSK SHA1";
static const char HT_05500[] = "NetNTLMv1-VANILLA / NetNTLMv1+ESS"; static const char HT_05500[] = "NetNTLMv1 / NetNTLMv1+ESS";
static const char HT_05600[] = "NetNTLMv2"; static const char HT_05600[] = "NetNTLMv2";
static const char HT_05700[] = "Cisco-IOS SHA256"; static const char HT_05700[] = "Cisco-IOS $4$ (SHA256)";
static const char HT_05800[] = "Android PIN"; static const char HT_05800[] = "Android PIN";
static const char HT_06000[] = "RipeMD160"; static const char HT_06000[] = "RIPEMD-160";
static const char HT_06100[] = "Whirlpool"; static const char HT_06100[] = "Whirlpool";
static const char HT_06300[] = "AIX {smd5}"; static const char HT_06300[] = "AIX {smd5}";
static const char HT_06400[] = "AIX {ssha256}"; static const char HT_06400[] = "AIX {ssha256}";
static const char HT_06500[] = "AIX {ssha512}"; static const char HT_06500[] = "AIX {ssha512}";
static const char HT_06600[] = "1Password, agilekeychain"; static const char HT_06600[] = "1Password, agilekeychain";
static const char HT_06700[] = "AIX {ssha1}"; static const char HT_06700[] = "AIX {ssha1}";
static const char HT_06800[] = "Lastpass"; static const char HT_06800[] = "LastPass + LastPass sniffed";
static const char HT_06900[] = "GOST R 34.11-94"; static const char HT_06900[] = "GOST R 34.11-94";
static const char HT_07000[] = "Fortigate (FortiOS)"; static const char HT_07000[] = "FortiGate (FortiOS)";
static const char HT_07100[] = "OSX v10.8+"; static const char HT_07100[] = "OSX v10.8+ (PBKDF2-SHA512)";
static const char HT_07200[] = "GRUB 2"; static const char HT_07200[] = "GRUB 2";
static const char HT_07300[] = "IPMI2 RAKP HMAC-SHA1"; static const char HT_07300[] = "IPMI2 RAKP HMAC-SHA1";
static const char HT_07400[] = "sha256crypt, SHA256(Unix)"; static const char HT_07400[] = "sha256crypt $5$, SHA256 (Unix)";
static const char HT_07500[] = "Kerberos 5 AS-REQ Pre-Auth etype 23"; static const char HT_07500[] = "Kerberos 5 AS-REQ Pre-Auth etype 23";
static const char HT_07700[] = "SAP CODVN B (BCODE)"; static const char HT_07700[] = "SAP CODVN B (BCODE)";
static const char HT_07800[] = "SAP CODVN F/G (PASSCODE)"; static const char HT_07800[] = "SAP CODVN F/G (PASSCODE)";
@ -169,7 +168,7 @@ static const char HT_08000[] = "Sybase ASE";
static const char HT_08100[] = "Citrix NetScaler"; static const char HT_08100[] = "Citrix NetScaler";
static const char HT_08200[] = "1Password, cloudkeychain"; static const char HT_08200[] = "1Password, cloudkeychain";
static const char HT_08300[] = "DNSSEC (NSEC3)"; static const char HT_08300[] = "DNSSEC (NSEC3)";
static const char HT_08400[] = "WBB3, Woltlab Burning Board 3"; static const char HT_08400[] = "WBB3 (Woltlab Burning Board)";
static const char HT_08500[] = "RACF"; static const char HT_08500[] = "RACF";
static const char HT_08600[] = "Lotus Notes/Domino 5"; static const char HT_08600[] = "Lotus Notes/Domino 5";
static const char HT_08700[] = "Lotus Notes/Domino 6"; static const char HT_08700[] = "Lotus Notes/Domino 6";
@ -177,33 +176,33 @@ static const char HT_08800[] = "Android FDE <= 4.3";
static const char HT_08900[] = "scrypt"; static const char HT_08900[] = "scrypt";
static const char HT_09000[] = "Password Safe v2"; static const char HT_09000[] = "Password Safe v2";
static const char HT_09100[] = "Lotus Notes/Domino 8"; static const char HT_09100[] = "Lotus Notes/Domino 8";
static const char HT_09200[] = "Cisco $8$"; static const char HT_09200[] = "Cisco-IOS $8$ (PBKDF2-SHA256)";
static const char HT_09300[] = "Cisco $9$"; static const char HT_09300[] = "Cisco-IOS $9$ (scrypt)";
static const char HT_09400[] = "Office 2007"; static const char HT_09400[] = "MS Office 2007";
static const char HT_09500[] = "Office 2010"; static const char HT_09500[] = "MS Office 2010";
static const char HT_09600[] = "Office 2013"; static const char HT_09600[] = "MS Office 2013";
static const char HT_09700[] = "MS Office <= 2003 MD5 + RC4, oldoffice$0, oldoffice$1"; static const char HT_09700[] = "MS Office <= 2003 $0/$1, MD5 + RC4";
static const char HT_09710[] = "MS Office <= 2003 MD5 + RC4, collision-mode #1"; static const char HT_09710[] = "MS Office <= 2003 $0/$1, MD5 + RC4, collider #1";
static const char HT_09720[] = "MS Office <= 2003 MD5 + RC4, collision-mode #2"; static const char HT_09720[] = "MS Office <= 2003 $0/$1, MD5 + RC4, collider #2";
static const char HT_09800[] = "MS Office <= 2003 SHA1 + RC4, oldoffice$3, oldoffice$4"; static const char HT_09800[] = "MS Office <= 2003 $3/$4, SHA1 + RC4";
static const char HT_09810[] = "MS Office <= 2003 SHA1 + RC4, collision-mode #1"; static const char HT_09810[] = "MS Office <= 2003 $3/$4, SHA1 + RC4, collider #1";
static const char HT_09820[] = "MS Office <= 2003 SHA1 + RC4, collision-mode #2"; static const char HT_09820[] = "MS Office <= 2003 $3/$4, SHA1 + RC4, collider #2";
static const char HT_09900[] = "Radmin2"; static const char HT_09900[] = "Radmin2";
static const char HT_10000[] = "Django (PBKDF2-SHA256)"; static const char HT_10000[] = "Django (PBKDF2-SHA256)";
static const char HT_10100[] = "SipHash"; static const char HT_10100[] = "SipHash";
static const char HT_10200[] = "Cram MD5"; static const char HT_10200[] = "CRAM-MD5";
static const char HT_10300[] = "SAP CODVN H (PWDSALTEDHASH) iSSHA-1"; static const char HT_10300[] = "SAP CODVN H (PWDSALTEDHASH) iSSHA-1";
static const char HT_10400[] = "PDF 1.1 - 1.3 (Acrobat 2 - 4)"; static const char HT_10400[] = "PDF 1.1 - 1.3 (Acrobat 2 - 4)";
static const char HT_10410[] = "PDF 1.1 - 1.3 (Acrobat 2 - 4) + collider-mode #1"; static const char HT_10410[] = "PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1";
static const char HT_10420[] = "PDF 1.1 - 1.3 (Acrobat 2 - 4) + collider-mode #2"; static const char HT_10420[] = "PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2";
static const char HT_10500[] = "PDF 1.4 - 1.6 (Acrobat 5 - 8)"; static const char HT_10500[] = "PDF 1.4 - 1.6 (Acrobat 5 - 8)";
static const char HT_10600[] = "PDF 1.7 Level 3 (Acrobat 9)"; static const char HT_10600[] = "PDF 1.7 Level 3 (Acrobat 9)";
static const char HT_10700[] = "PDF 1.7 Level 8 (Acrobat 10 - 11)"; static const char HT_10700[] = "PDF 1.7 Level 8 (Acrobat 10 - 11)";
static const char HT_10800[] = "SHA384"; static const char HT_10800[] = "SHA-384";
static const char HT_10900[] = "PBKDF2-HMAC-SHA256"; static const char HT_10900[] = "PBKDF2-HMAC-SHA256";
static const char HT_11000[] = "PrestaShop"; static const char HT_11000[] = "PrestaShop";
static const char HT_11100[] = "PostgreSQL Challenge-Response Authentication (MD5)"; static const char HT_11100[] = "PostgreSQL CRAM (MD5)";
static const char HT_11200[] = "MySQL Challenge-Response Authentication (SHA1)"; static const char HT_11200[] = "MySQL CRAM (SHA1)";
static const char HT_11300[] = "Bitcoin/Litecoin wallet.dat"; static const char HT_11300[] = "Bitcoin/Litecoin wallet.dat";
static const char HT_11400[] = "SIP digest authentication (MD5)"; static const char HT_11400[] = "SIP digest authentication (MD5)";
static const char HT_11500[] = "CRC32"; static const char HT_11500[] = "CRC32";
@ -224,11 +223,11 @@ static const char HT_12900[] = "Android FDE (Samsung DEK)";
static const char HT_13000[] = "RAR5"; static const char HT_13000[] = "RAR5";
static const char HT_13100[] = "Kerberos 5 TGS-REP etype 23"; static const char HT_13100[] = "Kerberos 5 TGS-REP etype 23";
static const char HT_13200[] = "AxCrypt"; static const char HT_13200[] = "AxCrypt";
static const char HT_13300[] = "AxCrypt in memory SHA1"; 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_13400[] = "KeePass 1 (AES/Twofish) and KeePass 2 (AES)";
static const char HT_13500[] = "PeopleSoft PS_TOKEN"; static const char HT_13500[] = "PeopleSoft PS_TOKEN";
static const char HT_13600[] = "WinZip"; static const char HT_13600[] = "WinZip";
static const char HT_13800[] = "Windows 8+ phone PIN/Password"; static const char HT_13800[] = "Windows 8+ phone PIN/password";
static const char HT_13900[] = "OpenCart"; static const char HT_13900[] = "OpenCart";
static const char HT_14000[] = "DES (PT = $salt, key = $pass)"; static const char HT_14000[] = "DES (PT = $salt, key = $pass)";
static const char HT_14100[] = "3DES (PT = $salt, key = $pass)"; static const char HT_14100[] = "3DES (PT = $salt, key = $pass)";
@ -236,7 +235,7 @@ static const char HT_14400[] = "sha1(CX)";
static const char HT_14600[] = "LUKS"; static const char HT_14600[] = "LUKS";
static const char HT_14700[] = "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_14800[] = "iTunes Backup >= 10.0";
static const char HT_14900[] = "Skip32"; static const char HT_14900[] = "Skip32 (PT = $salt, key = $pass)";
static const char HT_15000[] = "FileZilla Server >= 0.9.55"; static const char HT_15000[] = "FileZilla Server >= 0.9.55";
static const char HT_15100[] = "Juniper/NetBSD sha1crypt"; static const char HT_15100[] = "Juniper/NetBSD sha1crypt";
static const char HT_99999[] = "Plaintext"; static const char HT_99999[] = "Plaintext";
@ -244,55 +243,55 @@ static const char HT_99999[] = "Plaintext";
static const char HT_00011[] = "Joomla < 2.5.18"; static const char HT_00011[] = "Joomla < 2.5.18";
static const char HT_00012[] = "PostgreSQL"; static const char HT_00012[] = "PostgreSQL";
static const char HT_00021[] = "osCommerce, xt:Commerce"; static const char HT_00021[] = "osCommerce, xt:Commerce";
static const char HT_00022[] = "Juniper Netscreen/SSG (ScreenOS)"; static const char HT_00022[] = "Juniper NetScreen/SSG (ScreenOS)";
static const char HT_00023[] = "Skype"; static const char HT_00023[] = "Skype";
static const char HT_00101[] = "SHA-1(Base64), nsldap, Netscape LDAP SHA"; static const char HT_00101[] = "nsldap, SHA-1(Base64), Netscape LDAP SHA";
static const char HT_00111[] = "SSHA-1(Base64), nsldaps, Netscape LDAP SSHA"; static const char HT_00111[] = "nsldaps, SSHA-1(Base64), Netscape LDAP SSHA";
static const char HT_00112[] = "Oracle S: Type (Oracle 11+)"; static const char HT_00112[] = "Oracle S: Type (Oracle 11+)";
static const char HT_00121[] = "SMF > v1.1"; static const char HT_00121[] = "SMF (Simple Machines Forum) > v1.1";
static const char HT_00122[] = "OSX v10.4, v10.5, v10.6"; static const char HT_00122[] = "OSX v10.4, OSX v10.5, OSX v10.6";
static const char HT_00124[] = "Django (SHA-1)"; static const char HT_00124[] = "Django (SHA-1)";
static const char HT_00125[] = "ArubaOS"; static const char HT_00125[] = "ArubaOS";
static const char HT_00131[] = "MSSQL(2000)"; static const char HT_00131[] = "MSSQL (2000)";
static const char HT_00132[] = "MSSQL(2005)"; static const char HT_00132[] = "MSSQL (2005)";
static const char HT_00133[] = "PeopleSoft"; static const char HT_00133[] = "PeopleSoft";
static const char HT_00141[] = "EPiServer 6.x < v4"; static const char HT_00141[] = "Episerver 6.x < .NET 4";
static const char HT_01411[] = "SSHA-256(Base64), LDAP {SSHA256}"; static const char HT_01411[] = "SSHA-256(Base64), LDAP {SSHA256}";
static const char HT_01421[] = "hMailServer"; static const char HT_01421[] = "hMailServer";
static const char HT_01441[] = "EPiServer 6.x > v4"; static const char HT_01441[] = "Episerver 6.x >= .NET 4";
static const char HT_01711[] = "SSHA-512(Base64), LDAP {SSHA512}"; static const char HT_01711[] = "SSHA-512(Base64), LDAP {SSHA512}";
static const char HT_01722[] = "OSX v10.7"; static const char HT_01722[] = "OSX v10.7";
static const char HT_01731[] = "MSSQL(2012)"; static const char HT_01731[] = "MSSQL (2012, 2014)";
static const char HT_02611[] = "vBulletin < v3.8.5"; static const char HT_02611[] = "vBulletin < v3.8.5";
static const char HT_02612[] = "PHPS"; static const char HT_02612[] = "PHPS";
static const char HT_02711[] = "vBulletin > v3.8.5"; static const char HT_02711[] = "vBulletin >= v3.8.5";
static const char HT_02811[] = "IPB2+, MyBB1.2+"; static const char HT_02811[] = "IPB2+ (Invision Power Board), MyBB 1.2+";
static const char HT_04521[] = "Redmine Project Management Web App"; static const char HT_04521[] = "Redmine";
static const char HT_04522[] = "PunBB"; static const char HT_04522[] = "PunBB";
static const char HT_06211[] = "TrueCrypt PBKDF2-HMAC-RipeMD160 + XTS 512 bit"; static const char HT_06211[] = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 512 bit";
static const char HT_06212[] = "TrueCrypt PBKDF2-HMAC-RipeMD160 + XTS 1024 bit"; static const char HT_06212[] = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1024 bit";
static const char HT_06213[] = "TrueCrypt PBKDF2-HMAC-RipeMD160 + XTS 1536 bit"; static const char HT_06213[] = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1536 bit";
static const char HT_06221[] = "TrueCrypt PBKDF2-HMAC-SHA512 + XTS 512 bit"; static const char HT_06221[] = "TrueCrypt PBKDF2-HMAC-SHA512 + XTS 512 bit";
static const char HT_06222[] = "TrueCrypt PBKDF2-HMAC-SHA512 + XTS 1024 bit"; static const char HT_06222[] = "TrueCrypt PBKDF2-HMAC-SHA512 + XTS 1024 bit";
static const char HT_06223[] = "TrueCrypt PBKDF2-HMAC-SHA512 + XTS 1536 bit"; static const char HT_06223[] = "TrueCrypt PBKDF2-HMAC-SHA512 + XTS 1536 bit";
static const char HT_06231[] = "TrueCrypt PBKDF2-HMAC-Whirlpool + XTS 512 bit"; static const char HT_06231[] = "TrueCrypt PBKDF2-HMAC-Whirlpool + XTS 512 bit";
static const char HT_06232[] = "TrueCrypt PBKDF2-HMAC-Whirlpool + XTS 1024 bit"; static const char HT_06232[] = "TrueCrypt PBKDF2-HMAC-Whirlpool + XTS 1024 bit";
static const char HT_06233[] = "TrueCrypt PBKDF2-HMAC-Whirlpool + XTS 1536 bit"; static const char HT_06233[] = "TrueCrypt PBKDF2-HMAC-Whirlpool + XTS 1536 bit";
static const char HT_06241[] = "TrueCrypt PBKDF2-HMAC-RipeMD160 + XTS 512 bit + boot-mode"; static const char HT_06241[] = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 512 bit + boot-mode";
static const char HT_06242[] = "TrueCrypt PBKDF2-HMAC-RipeMD160 + XTS 1024 bit + boot-mode"; static const char HT_06242[] = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1024 bit + boot-mode";
static const char HT_06243[] = "TrueCrypt PBKDF2-HMAC-RipeMD160 + XTS 1536 bit + boot-mode"; static const char HT_06243[] = "TrueCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1536 bit + boot-mode";
static const char HT_13711[] = "VeraCrypt PBKDF2-HMAC-RipeMD160 + XTS 512 bit"; static const char HT_13711[] = "VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 512 bit";
static const char HT_13712[] = "VeraCrypt PBKDF2-HMAC-RipeMD160 + XTS 1024 bit"; static const char HT_13712[] = "VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1024 bit";
static const char HT_13713[] = "VeraCrypt PBKDF2-HMAC-RipeMD160 + XTS 1536 bit"; static const char HT_13713[] = "VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1536 bit";
static const char HT_13721[] = "VeraCrypt PBKDF2-HMAC-SHA512 + XTS 512 bit"; static const char HT_13721[] = "VeraCrypt PBKDF2-HMAC-SHA512 + XTS 512 bit";
static const char HT_13722[] = "VeraCrypt PBKDF2-HMAC-SHA512 + XTS 1024 bit"; static const char HT_13722[] = "VeraCrypt PBKDF2-HMAC-SHA512 + XTS 1024 bit";
static const char HT_13723[] = "VeraCrypt PBKDF2-HMAC-SHA512 + XTS 1536 bit"; static const char HT_13723[] = "VeraCrypt PBKDF2-HMAC-SHA512 + XTS 1536 bit";
static const char HT_13731[] = "VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 512 bit"; static const char HT_13731[] = "VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 512 bit";
static const char HT_13732[] = "VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 1024 bit"; static const char HT_13732[] = "VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 1024 bit";
static const char HT_13733[] = "VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 1536 bit"; static const char HT_13733[] = "VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 1536 bit";
static const char HT_13741[] = "VeraCrypt PBKDF2-HMAC-RipeMD160 + XTS 512 bit + boot-mode"; static const char HT_13741[] = "VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 512 bit + boot-mode";
static const char HT_13742[] = "VeraCrypt PBKDF2-HMAC-RipeMD160 + XTS 1024 bit + boot-mode"; static const char HT_13742[] = "VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1024 bit + boot-mode";
static const char HT_13743[] = "VeraCrypt PBKDF2-HMAC-RipeMD160 + XTS 1536 bit + boot-mode"; static const char HT_13743[] = "VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1536 bit + boot-mode";
static const char HT_13751[] = "VeraCrypt PBKDF2-HMAC-SHA256 + XTS 512 bit"; static const char HT_13751[] = "VeraCrypt PBKDF2-HMAC-SHA256 + XTS 512 bit";
static const char HT_13752[] = "VeraCrypt PBKDF2-HMAC-SHA256 + XTS 1024 bit"; static const char HT_13752[] = "VeraCrypt PBKDF2-HMAC-SHA256 + XTS 1024 bit";
static const char HT_13753[] = "VeraCrypt PBKDF2-HMAC-SHA256 + XTS 1536 bit"; static const char HT_13753[] = "VeraCrypt PBKDF2-HMAC-SHA256 + XTS 1536 bit";
@ -14896,7 +14895,6 @@ char *strhashtype (const u32 hash_mode)
case 500: return ((char *) HT_00500); case 500: return ((char *) HT_00500);
case 501: return ((char *) HT_00501); case 501: return ((char *) HT_00501);
case 900: return ((char *) HT_00900); case 900: return ((char *) HT_00900);
case 910: return ((char *) HT_00910);
case 1000: return ((char *) HT_01000); case 1000: return ((char *) HT_01000);
case 1100: return ((char *) HT_01100); case 1100: return ((char *) HT_01100);
case 1300: return ((char *) HT_01300); case 1300: return ((char *) HT_01300);

77
src/usage.c
View File

@ -122,7 +122,7 @@ static const char *USAGE_BIG[] =
" 1400 | SHA-256 | Raw Hash", " 1400 | SHA-256 | Raw Hash",
" 10800 | SHA-384 | Raw Hash", " 10800 | SHA-384 | Raw Hash",
" 1700 | SHA-512 | Raw Hash", " 1700 | SHA-512 | Raw Hash",
" 5000 | SHA-3(Keccak) | Raw Hash", " 5000 | SHA-3 (Keccak) | Raw Hash",
" 10100 | SipHash | Raw Hash", " 10100 | SipHash | Raw Hash",
" 6000 | RIPEMD-160 | Raw Hash", " 6000 | RIPEMD-160 | Raw Hash",
" 6100 | Whirlpool | Raw Hash", " 6100 | Whirlpool | Raw Hash",
@ -181,7 +181,7 @@ static const char *USAGE_BIG[] =
" 5300 | IKE-PSK MD5 | Network Protocols", " 5300 | IKE-PSK MD5 | Network Protocols",
" 5400 | IKE-PSK SHA1 | Network Protocols", " 5400 | IKE-PSK SHA1 | Network Protocols",
" 5500 | NetNTLMv1 | Network Protocols", " 5500 | NetNTLMv1 | Network Protocols",
" 5500 | NetNTLMv1 + ESS | Network Protocols", " 5500 | NetNTLMv1+ESS | Network Protocols",
" 5600 | NetNTLMv2 | Network Protocols", " 5600 | NetNTLMv2 | Network Protocols",
" 7300 | IPMI2 RAKP HMAC-SHA1 | Network Protocols", " 7300 | IPMI2 RAKP HMAC-SHA1 | Network Protocols",
" 7500 | Kerberos 5 AS-REQ Pre-Auth etype 23 | Network Protocols", " 7500 | Kerberos 5 AS-REQ Pre-Auth etype 23 | Network Protocols",
@ -191,16 +191,16 @@ static const char *USAGE_BIG[] =
" 11200 | MySQL CRAM (SHA1) | Network Protocols", " 11200 | MySQL CRAM (SHA1) | Network Protocols",
" 11400 | SIP digest authentication (MD5) | Network Protocols", " 11400 | SIP digest authentication (MD5) | Network Protocols",
" 13100 | Kerberos 5 TGS-REP etype 23 | Network Protocols", " 13100 | Kerberos 5 TGS-REP etype 23 | Network Protocols",
" 121 | SMF (Simple Machines Forum) | Forums, CMS, E-Commerce, Frameworks", " 121 | SMF (Simple Machines Forum) > v1.1 | Forums, CMS, E-Commerce, Frameworks",
" 400 | phpBB3 | Forums, CMS, E-Commerce, Frameworks", " 400 | phpBB3 (MD5) | Forums, CMS, E-Commerce, Frameworks",
" 2611 | vBulletin < v3.8.5 | Forums, CMS, E-Commerce, Frameworks", " 2611 | vBulletin < v3.8.5 | Forums, CMS, E-Commerce, Frameworks",
" 2711 | vBulletin > v3.8.5 | Forums, CMS, E-Commerce, Frameworks", " 2711 | vBulletin >= v3.8.5 | Forums, CMS, E-Commerce, Frameworks",
" 2811 | MyBB | Forums, CMS, E-Commerce, Frameworks", " 2811 | MyBB 1.2+ | Forums, CMS, E-Commerce, Frameworks",
" 2811 | IPB (Invison Power Board) | Forums, CMS, E-Commerce, Frameworks", " 2811 | IPB2+ (Invision Power Board) | Forums, CMS, E-Commerce, Frameworks",
" 8400 | WBB3 (Woltlab Burning Board) | Forums, CMS, E-Commerce, Frameworks", " 8400 | WBB3 (Woltlab Burning Board) | Forums, CMS, E-Commerce, Frameworks",
" 11 | Joomla < 2.5.18 | Forums, CMS, E-Commerce, Frameworks", " 11 | Joomla < 2.5.18 | Forums, CMS, E-Commerce, Frameworks",
" 400 | Joomla >= 2.5.18 | Forums, CMS, E-Commerce, Frameworks", " 400 | Joomla >= 2.5.18 (MD5) | Forums, CMS, E-Commerce, Frameworks",
" 400 | WordPress | Forums, CMS, E-Commerce, Frameworks", " 400 | WordPress (MD5) | Forums, CMS, E-Commerce, Frameworks",
" 2612 | PHPS | Forums, CMS, E-Commerce, Frameworks", " 2612 | PHPS | Forums, CMS, E-Commerce, Frameworks",
" 7900 | Drupal7 | Forums, CMS, E-Commerce, Frameworks", " 7900 | Drupal7 | Forums, CMS, E-Commerce, Frameworks",
" 21 | osCommerce | Forums, CMS, E-Commerce, Frameworks", " 21 | osCommerce | Forums, CMS, E-Commerce, Frameworks",
@ -216,17 +216,16 @@ static const char *USAGE_BIG[] =
" 12 | PostgreSQL | Database Server", " 12 | PostgreSQL | Database Server",
" 131 | MSSQL (2000) | Database Server", " 131 | MSSQL (2000) | Database Server",
" 132 | MSSQL (2005) | Database Server", " 132 | MSSQL (2005) | Database Server",
" 1731 | MSSQL (2012) | Database Server", " 1731 | MSSQL (2012, 2014) | Database Server",
" 1731 | MSSQL (2014) | Database Server",
" 200 | MySQL323 | Database Server", " 200 | MySQL323 | Database Server",
" 300 | MySQL4.1/MySQL5 | Database Server", " 300 | MySQL4.1/MySQL5 | Database Server",
" 3100 | Oracle H: Type (Oracle 7+) | Database Server", " 3100 | Oracle H: Type (Oracle 7+) | Database Server",
" 112 | Oracle S: Type (Oracle 11+) | Database Server", " 112 | Oracle S: Type (Oracle 11+) | Database Server",
" 12300 | Oracle T: Type (Oracle 12+) | Database Server", " 12300 | Oracle T: Type (Oracle 12+) | Database Server",
" 8000 | Sybase ASE | Database Server", " 8000 | Sybase ASE | Database Server",
" 141 | Episerver 6.x < v4 | HTTP, SMTP, LDAP Server", " 141 | Episerver 6.x < .NET 4 | HTTP, SMTP, LDAP Server",
" 1441 | Episerver 6.x > v4 | HTTP, SMTP, LDAP Server", " 1441 | Episerver 6.x >= .NET 4 | HTTP, SMTP, LDAP Server",
" 1600 | Apache $apr1$ | HTTP, SMTP, LDAP Server", " 1600 | Apache $apr1$ MD5, md5apr1, MD5 (APR) | HTTP, SMTP, LDAP Server",
" 12600 | ColdFusion 10+ | HTTP, SMTP, LDAP Server", " 12600 | ColdFusion 10+ | HTTP, SMTP, LDAP Server",
" 1421 | hMailServer | HTTP, SMTP, LDAP Server", " 1421 | hMailServer | HTTP, SMTP, LDAP Server",
" 101 | nsldap, SHA-1(Base64), Netscape LDAP SHA | HTTP, SMTP, LDAP Server", " 101 | nsldap, SHA-1(Base64), Netscape LDAP SHA | HTTP, SMTP, LDAP Server",
@ -239,26 +238,26 @@ static const char *USAGE_BIG[] =
" 1000 | NTLM | Operating Systems", " 1000 | NTLM | Operating Systems",
" 1100 | Domain Cached Credentials (DCC), MS Cache | Operating Systems", " 1100 | Domain Cached Credentials (DCC), MS Cache | Operating Systems",
" 2100 | Domain Cached Credentials 2 (DCC2), MS Cache 2 | Operating Systems", " 2100 | Domain Cached Credentials 2 (DCC2), MS Cache 2 | Operating Systems",
" 12800 | MS-AzureSync PBKDF2-HMAC-SHA256 | Operating Systems", " 12800 | MS-AzureSync PBKDF2-HMAC-SHA256 | Operating Systems",
" 1500 | descrypt, DES(Unix), Traditional DES | Operating Systems", " 1500 | descrypt, DES (Unix), Traditional DES | Operating Systems",
" 12400 | BSDiCrypt, Extended DES | Operating Systems", " 12400 | BSDiCrypt, Extended DES | Operating Systems",
" 500 | md5crypt $1$, MD5(Unix) | Operating Systems", " 500 | md5crypt, MD5 (Unix), Cisco-IOS $1$ (MD5) | Operating Systems",
" 3200 | bcrypt $2*$, Blowfish(Unix) | Operating Systems", " 3200 | bcrypt $2*$, Blowfish (Unix) | Operating Systems",
" 7400 | sha256crypt $5$, SHA256(Unix) | Operating Systems", " 7400 | sha256crypt $5$, SHA256 (Unix) | Operating Systems",
" 1800 | sha512crypt $6$, SHA512(Unix) | Operating Systems", " 1800 | sha512crypt $6$, SHA512 (Unix) | Operating Systems",
" 122 | OSX v10.4, OSX v10.5, OSX v10.6 | Operating Systems", " 122 | OSX v10.4, OSX v10.5, OSX v10.6 | Operating Systems",
" 1722 | OSX v10.7 | Operating Systems", " 1722 | OSX v10.7 | Operating Systems",
" 7100 | OSX v10.8, OSX v10.9, OSX v10.10 | Operating Systems", " 7100 | OSX v10.8+ (PBKDF2-SHA512) | Operating Systems",
" 6300 | AIX {smd5} | Operating Systems", " 6300 | AIX {smd5} | Operating Systems",
" 6700 | AIX {ssha1} | Operating Systems", " 6700 | AIX {ssha1} | Operating Systems",
" 6400 | AIX {ssha256} | Operating Systems", " 6400 | AIX {ssha256} | Operating Systems",
" 6500 | AIX {ssha512} | Operating Systems", " 6500 | AIX {ssha512} | Operating Systems",
" 2400 | Cisco-PIX | Operating Systems", " 2400 | Cisco-PIX MD5 | Operating Systems",
" 2410 | Cisco-ASA | Operating Systems", " 2410 | Cisco-ASA MD5 | Operating Systems",
" 500 | Cisco-IOS $1$ | Operating Systems", " 500 | Cisco-IOS $1$ (MD5) | Operating Systems",
" 5700 | Cisco-IOS $4$ | Operating Systems", " 5700 | Cisco-IOS $4$ (SHA256) | Operating Systems",
" 9200 | Cisco-IOS $8$ | Operating Systems", " 9200 | Cisco-IOS $8$ (PBKDF2-SHA256) | Operating Systems",
" 9300 | Cisco-IOS $9$ | Operating Systems", " 9300 | Cisco-IOS $9$ (scrypt) | Operating Systems",
" 22 | Juniper NetScreen/SSG (ScreenOS) | Operating Systems", " 22 | Juniper NetScreen/SSG (ScreenOS) | Operating Systems",
" 501 | Juniper IVE | Operating Systems", " 501 | Juniper IVE | Operating Systems",
" 15100 | Juniper/NetBSD sha1crypt | Operating Systems", " 15100 | Juniper/NetBSD sha1crypt | Operating Systems",
@ -277,7 +276,7 @@ static const char *USAGE_BIG[] =
" 8700 | Lotus Notes/Domino 6 | Enterprise Application Software (EAS)", " 8700 | Lotus Notes/Domino 6 | Enterprise Application Software (EAS)",
" 9100 | Lotus Notes/Domino 8 | Enterprise Application Software (EAS)", " 9100 | Lotus Notes/Domino 8 | Enterprise Application Software (EAS)",
" 133 | PeopleSoft | Enterprise Application Software (EAS)", " 133 | PeopleSoft | Enterprise Application Software (EAS)",
" 13500 | PeopleSoft Token | Enterprise Application Software (EAS)", " 13500 | PeopleSoft PS_TOKEN | Enterprise Application Software (EAS)",
" 11600 | 7-Zip | Archives", " 11600 | 7-Zip | Archives",
" 12500 | RAR3-hp | Archives", " 12500 | RAR3-hp | Archives",
" 13000 | RAR5 | Archives", " 13000 | RAR5 | Archives",
@ -287,10 +286,10 @@ static const char *USAGE_BIG[] =
" 14700 | iTunes Backup < 10.0 | Backup", " 14700 | iTunes Backup < 10.0 | Backup",
" 14800 | iTunes Backup >= 10.0 | Backup", " 14800 | iTunes Backup >= 10.0 | Backup",
" 62XY | TrueCrypt | Full-Disk Encryption (FDE)", " 62XY | TrueCrypt | Full-Disk Encryption (FDE)",
" X | 1 = PBKDF2-HMAC-RipeMD160 | Full-Disk Encryption (FDE)", " X | 1 = PBKDF2-HMAC-RIPEMD160 | Full-Disk Encryption (FDE)",
" X | 2 = PBKDF2-HMAC-SHA512 | Full-Disk Encryption (FDE)", " X | 2 = PBKDF2-HMAC-SHA512 | Full-Disk Encryption (FDE)",
" X | 3 = PBKDF2-HMAC-Whirlpool | Full-Disk Encryption (FDE)", " X | 3 = PBKDF2-HMAC-Whirlpool | Full-Disk Encryption (FDE)",
" X | 4 = PBKDF2-HMAC-RipeMD160 + boot-mode | Full-Disk Encryption (FDE)", " X | 4 = PBKDF2-HMAC-RIPEMD160 + boot-mode | Full-Disk Encryption (FDE)",
" Y | 1 = XTS 512 bit pure AES | Full-Disk Encryption (FDE)", " Y | 1 = XTS 512 bit pure AES | Full-Disk Encryption (FDE)",
" Y | 1 = XTS 512 bit pure Serpent | Full-Disk Encryption (FDE)", " Y | 1 = XTS 512 bit pure Serpent | Full-Disk Encryption (FDE)",
" Y | 1 = XTS 512 bit pure Twofish | Full-Disk Encryption (FDE)", " Y | 1 = XTS 512 bit pure Twofish | Full-Disk Encryption (FDE)",
@ -301,14 +300,14 @@ static const char *USAGE_BIG[] =
" Y | 2 = XTS 1024 bit cascaded Serpent-AES | Full-Disk Encryption (FDE)", " Y | 2 = XTS 1024 bit cascaded Serpent-AES | Full-Disk Encryption (FDE)",
" Y | 2 = XTS 1024 bit cascaded Twofish-Serpent | Full-Disk Encryption (FDE)", " Y | 2 = XTS 1024 bit cascaded Twofish-Serpent | Full-Disk Encryption (FDE)",
" Y | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)", " Y | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)",
" 8800 | Android FDE < v4.3 | Full-Disk Encryption (FDE)", " 8800 | Android FDE <= 4.3 | Full-Disk Encryption (FDE)",
" 12900 | Android FDE (Samsung DEK) | Full-Disk Encryption (FDE)", " 12900 | Android FDE (Samsung DEK) | Full-Disk Encryption (FDE)",
" 12200 | eCryptfs | Full-Disk Encryption (FDE)", " 12200 | eCryptfs | Full-Disk Encryption (FDE)",
" 137XY | VeraCrypt | Full-Disk Encryption (FDE)", " 137XY | VeraCrypt | Full-Disk Encryption (FDE)",
" X | 1 = PBKDF2-HMAC-RipeMD160 | Full-Disk Encryption (FDE)", " X | 1 = PBKDF2-HMAC-RIPEMD160 | Full-Disk Encryption (FDE)",
" X | 2 = PBKDF2-HMAC-SHA512 | Full-Disk Encryption (FDE)", " X | 2 = PBKDF2-HMAC-SHA512 | Full-Disk Encryption (FDE)",
" X | 3 = PBKDF2-HMAC-Whirlpool | Full-Disk Encryption (FDE)", " X | 3 = PBKDF2-HMAC-Whirlpool | Full-Disk Encryption (FDE)",
" X | 4 = PBKDF2-HMAC-RipeMD160 + boot-mode | Full-Disk Encryption (FDE)", " X | 4 = PBKDF2-HMAC-RIPEMD160 + boot-mode | Full-Disk Encryption (FDE)",
" X | 5 = PBKDF2-HMAC-SHA256 | Full-Disk Encryption (FDE)", " X | 5 = PBKDF2-HMAC-SHA256 | Full-Disk Encryption (FDE)",
" X | 6 = PBKDF2-HMAC-SHA256 + boot-mode | Full-Disk Encryption (FDE)", " X | 6 = PBKDF2-HMAC-SHA256 + boot-mode | Full-Disk Encryption (FDE)",
" Y | 1 = XTS 512 bit pure AES | Full-Disk Encryption (FDE)", " Y | 1 = XTS 512 bit pure AES | Full-Disk Encryption (FDE)",
@ -322,12 +321,12 @@ static const char *USAGE_BIG[] =
" Y | 2 = XTS 1024 bit cascaded Twofish-Serpent | Full-Disk Encryption (FDE)", " Y | 2 = XTS 1024 bit cascaded Twofish-Serpent | Full-Disk Encryption (FDE)",
" Y | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)", " Y | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)",
" 14600 | LUKS | Full-Disk Encryption (FDE)", " 14600 | LUKS | Full-Disk Encryption (FDE)",
" 9700 | MS Office <= 2003 $0|$1, MD5 + RC4 | Documents", " 9700 | MS Office <= 2003 $0/$1, MD5 + RC4 | Documents",
" 9710 | MS Office <= 2003 $0|$1, MD5 + RC4, collider #1 | Documents", " 9710 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #1 | Documents",
" 9720 | MS Office <= 2003 $0|$1, MD5 + RC4, collider #2 | Documents", " 9720 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #2 | Documents",
" 9800 | MS Office <= 2003 $3|$4, SHA1 + RC4 | Documents", " 9800 | MS Office <= 2003 $3/$4, SHA1 + RC4 | Documents",
" 9810 | MS Office <= 2003 $3|$4, SHA1 + RC4, collider #1 | Documents", " 9810 | MS Office <= 2003 $3/$4, SHA1 + RC4, collider #1 | Documents",
" 9820 | MS Office <= 2003 $3|$4, SHA1 + RC4, collider #2 | Documents", " 9820 | MS Office <= 2003 $3/$4, SHA1 + RC4, collider #2 | Documents",
" 9400 | MS Office 2007 | Documents", " 9400 | MS Office 2007 | Documents",
" 9500 | MS Office 2010 | Documents", " 9500 | MS Office 2010 | Documents",
" 9600 | MS Office 2013 | Documents", " 9600 | MS Office 2013 | Documents",