diff --git a/src/usage.c b/src/usage.c index 3893178c2..dd4f63442 100644 --- a/src/usage.c +++ b/src/usage.c @@ -16,7 +16,7 @@ static const char *USAGE_MINI[] = static const char *USAGE_BIG[] = { - "%s, advanced password recovery", + "%s - advanced password recovery", "", "Usage: %s [options]... hash|hashfile|hccapxfile [dictionary|mask|directory]...", "", @@ -31,11 +31,11 @@ static const char *USAGE_BIG[] = " --quiet | | Suppress output |", " --hex-charset | | Assume charset is given in hex |", " --hex-salt | | Assume salt is given in hex |", - " --hex-wordlist | | Assume words in wordlist is given in hex |", + " --hex-wordlist | | Assume words in wordlist are given in hex |", " --force | | Ignore warnings |", - " --status | | Enable automatic update of the status-screen |", - " --status-timer | Num | Sets seconds between status-screen update to X | --status-timer=1", - " --machine-readable | | Display the status view in a machine readable format |", + " --status | | Enable automatic update of the status screen |", + " --status-timer | Num | Sets seconds between status screen updates to X | --status-timer=1", + " --machine-readable | | Display the status view in a machine-readable format |", " --keep-guessing | | Keep guessing the hash after it has been cracked |", " --loopback | | Add new plains to induct directory |", " --weak-hash-threshold | Num | Threshold X when to stop checking for weak hashes | --weak=0", @@ -54,10 +54,10 @@ static const char *USAGE_BIG[] = " --outfile-check-timer | Num | Sets seconds between outfile checks to X | --outfile-check=30", " -p, --separator | Char | Separator char for hashlists and outfile | -p :", " --stdout | | Do not crack a hash, instead print candidates only |", - " --show | | Compare hashlist with potfile; Show cracked hashes |", - " --left | | Compare hashlist with potfile; Show uncracked hashes |", + " --show | | Compare hashlist with potfile; show cracked hashes |", + " --left | | Compare hashlist with potfile; show uncracked hashes |", " --username | | Enable ignoring of usernames in hashfile |", - " --remove | | Enable remove of hash once it is cracked |", + " --remove | | Enable removal of hashes once they are cracked |", " --remove-timer | Num | Update input hash file each X seconds | --remove-timer=30", " --potfile-disable | | Do not write potfile |", " --potfile-path | Dir | Specific path to potfile | --potfile-path=my.pot", @@ -68,29 +68,29 @@ static const char *USAGE_BIG[] = " --logfile-disable | | Disable the logfile |", " --hccapx-message-pair | Num | Load only message pairs from hccapx matching X | --hccapx-message-pair=2", " --nonce-error-corrections | Num | The BF size range to replace AP's nonce last bytes | --nonce-error-corrections=16", - " --truecrypt-keyfiles | File | Keyfiles used, separate with comma | --truecrypt-key=x.png", - " --veracrypt-keyfiles | File | Keyfiles used, separate with comma | --veracrypt-key=x.txt", + " --truecrypt-keyfiles | File | Keyfiles to use, separated with commas | --truecrypt-key=x.png", + " --veracrypt-keyfiles | File | Keyfiles to use, separated with commas | --veracrypt-key=x.txt", " --veracrypt-pim | Num | VeraCrypt personal iterations multiplier | --veracrypt-pim=1000", " -b, --benchmark | | Run benchmark |", - " --speed-only | | Return expected speed of the attack and quit |", + " --speed-only | | Return expected speed of the attack, then quit |", " --progress-only | | Return ideal progress step size and time to process |", " -c, --segment-size | Num | Sets size in MB to cache from the wordfile to X | -c 32", " --bitmap-min | Num | Sets minimum bits allowed for bitmaps to X | --bitmap-min=24", " --bitmap-max | Num | Sets maximum bits allowed for bitmaps to X | --bitmap-max=24", - " --cpu-affinity | Str | Locks to CPU devices, separate with comma | --cpu-affinity=1,2,3", - " -I, --opencl-info | | Show info about OpenCL platforms/devices detected | -I", - " --opencl-platforms | Str | OpenCL platforms to use, separate with comma | --opencl-platforms=2", - " -d, --opencl-devices | Str | OpenCL devices to use, separate with comma | -d 1", - " -D, --opencl-device-types | Str | OpenCL device-types to use, separate with comma | -D 1", - " --opencl-vector-width | Num | Manual override OpenCL vector-width to X | --opencl-vector=4", + " --cpu-affinity | Str | Locks to CPU devices, separated with commas | --cpu-affinity=1,2,3", + " -I, --opencl-info | | Show info about detected OpenCL platforms/devices | -I", + " --opencl-platforms | Str | OpenCL platforms to use, separated with commas | --opencl-platforms=2", + " -d, --opencl-devices | Str | OpenCL devices to use, separated with commas | -d 1", + " -D, --opencl-device-types | Str | OpenCL device-types to use, separated with commas | -D 1", + " --opencl-vector-width | Num | Manually override OpenCL vector-width to X | --opencl-vector=4", " -w, --workload-profile | Num | Enable a specific workload profile, see pool below | -w 3", " -n, --kernel-accel | Num | Manual workload tuning, set outerloop step size to X | -n 64", " -u, --kernel-loops | Num | Manual workload tuning, set innerloop step size to X | -u 256", - " --nvidia-spin-damp | Num | Workaround NVidias CPU burning loop bug, in percent | --nvidia-spin-damp=50", + " --nvidia-spin-damp | Num | Workaround NVIDIAs CPU burning loop bug, in percent | --nvidia-spin-damp=50", " --gpu-temp-disable | | Disable temperature and fanspeed reads and triggers |", - " --gpu-temp-abort | Num | Abort if GPU temperature reaches X degrees celsius | --gpu-temp-abort=100", - " --gpu-temp-retain | Num | Try to retain GPU temperature at X degrees celsius | --gpu-temp-retain=95", - " --powertune-enable | | Enable power tuning, restores settings when finished |", + " --gpu-temp-abort | Num | Abort if GPU temperature reaches X degrees Celsius | --gpu-temp-abort=100", + " --gpu-temp-retain | Num | Try to retain GPU temperature at X degrees Celsius | --gpu-temp-retain=95", + " --powertune-enable | | Enable power tuning. Restores settings when finished |", " --scrypt-tmto | Num | Manually override TMTO value for scrypt to X | --scrypt-tmto=3", " -s, --skip | Num | Skip X words from the start | -s 1000000", " -l, --limit | Num | Limit X words from the start + skipped words | -l 1000000", @@ -99,8 +99,8 @@ static const char *USAGE_BIG[] = " -k, --rule-right | Rule | Single rule applied to each word from right wordlist | -k '^-'", " -r, --rules-file | File | Multiple rules applied to each word from wordlists | -r rules/best64.rule", " -g, --generate-rules | Num | Generate X random rules | -g 10000", - " --generate-rules-func-min | Num | Force min X funcs per rule |", - " --generate-rules-func-max | Num | Force max X funcs per rule |", + " --generate-rules-func-min | Num | Force min X functions per rule |", + " --generate-rules-func-max | Num | Force max X functions per rule |", " --generate-rules-seed | Num | Force RNG seed set to X |", " -1, --custom-charset1 | CS | User-defined charset ?1 | -1 ?l?d?u", " -2, --custom-charset2 | CS | User-defined charset ?2 | -2 ?l?d?s", @@ -124,40 +124,40 @@ static const char *USAGE_BIG[] = " 1700 | SHA-512 | Raw Hash", " 5000 | SHA-3(Keccak) | Raw Hash", " 10100 | SipHash | Raw Hash", - " 6000 | RipeMD160 | Raw Hash", + " 6000 | RIPEMD-160 | Raw Hash", " 6100 | Whirlpool | Raw Hash", " 6900 | GOST R 34.11-94 | Raw Hash", " 11700 | GOST R 34.11-2012 (Streebog) 256-bit | Raw Hash", " 11800 | GOST R 34.11-2012 (Streebog) 512-bit | Raw Hash", - " 10 | md5($pass.$salt) | Raw Hash, Salted and / or Iterated", - " 20 | md5($salt.$pass) | Raw Hash, Salted and / or Iterated", - " 30 | md5(unicode($pass).$salt) | Raw Hash, Salted and / or Iterated", - " 40 | md5($salt.unicode($pass)) | Raw Hash, Salted and / or Iterated", - " 3800 | md5($salt.$pass.$salt) | Raw Hash, Salted and / or Iterated", - " 3710 | md5($salt.md5($pass)) | Raw Hash, Salted and / or Iterated", - " 4010 | md5($salt.md5($salt.$pass)) | Raw Hash, Salted and / or Iterated", - " 4110 | md5($salt.md5($pass.$salt)) | Raw Hash, Salted and / or Iterated", - " 2600 | md5(md5($pass)) | Raw Hash, Salted and / or Iterated", - " 3910 | md5(md5($pass).md5($salt)) | Raw Hash, Salted and / or Iterated", - " 4300 | md5(strtoupper(md5($pass))) | Raw Hash, Salted and / or Iterated", - " 4400 | md5(sha1($pass)) | Raw Hash, Salted and / or Iterated", - " 110 | sha1($pass.$salt) | Raw Hash, Salted and / or Iterated", - " 120 | sha1($salt.$pass) | Raw Hash, Salted and / or Iterated", - " 130 | sha1(unicode($pass).$salt) | Raw Hash, Salted and / or Iterated", - " 140 | sha1($salt.unicode($pass)) | Raw Hash, Salted and / or Iterated", - " 4500 | sha1(sha1($pass)) | Raw Hash, Salted and / or Iterated", - " 4520 | sha1($salt.sha1($pass)) | Raw Hash, Salted and / or Iterated", - " 4700 | sha1(md5($pass)) | Raw Hash, Salted and / or Iterated", - " 4900 | sha1($salt.$pass.$salt) | Raw Hash, Salted and / or Iterated", - " 14400 | sha1(CX) | Raw Hash, Salted and / or Iterated", - " 1410 | sha256($pass.$salt) | Raw Hash, Salted and / or Iterated", - " 1420 | sha256($salt.$pass) | Raw Hash, Salted and / or Iterated", - " 1430 | sha256(unicode($pass).$salt) | Raw Hash, Salted and / or Iterated", - " 1440 | sha256($salt.unicode($pass)) | Raw Hash, Salted and / or Iterated", - " 1710 | sha512($pass.$salt) | Raw Hash, Salted and / or Iterated", - " 1720 | sha512($salt.$pass) | Raw Hash, Salted and / or Iterated", - " 1730 | sha512(unicode($pass).$salt) | Raw Hash, Salted and / or Iterated", - " 1740 | sha512($salt.unicode($pass)) | Raw Hash, Salted and / or Iterated", + " 10 | md5($pass.$salt) | Raw Hash, Salted and/or Iterated", + " 20 | md5($salt.$pass) | Raw Hash, Salted and/or Iterated", + " 30 | md5(unicode($pass).$salt) | Raw Hash, Salted and/or Iterated", + " 40 | md5($salt.unicode($pass)) | Raw Hash, Salted and/or Iterated", + " 3800 | md5($salt.$pass.$salt) | Raw Hash, Salted and/or Iterated", + " 3710 | md5($salt.md5($pass)) | Raw Hash, Salted and/or Iterated", + " 4010 | md5($salt.md5($salt.$pass)) | Raw Hash, Salted and/or Iterated", + " 4110 | md5($salt.md5($pass.$salt)) | Raw Hash, Salted and/or Iterated", + " 2600 | md5(md5($pass)) | Raw Hash, Salted and/or Iterated", + " 3910 | md5(md5($pass).md5($salt)) | Raw Hash, Salted and/or Iterated", + " 4300 | md5(strtoupper(md5($pass))) | Raw Hash, Salted and/or Iterated", + " 4400 | md5(sha1($pass)) | Raw Hash, Salted and/or Iterated", + " 110 | sha1($pass.$salt) | Raw Hash, Salted and/or Iterated", + " 120 | sha1($salt.$pass) | Raw Hash, Salted and/or Iterated", + " 130 | sha1(unicode($pass).$salt) | Raw Hash, Salted and/or Iterated", + " 140 | sha1($salt.unicode($pass)) | Raw Hash, Salted and/or Iterated", + " 4500 | sha1(sha1($pass)) | Raw Hash, Salted and/or Iterated", + " 4520 | sha1($salt.sha1($pass)) | Raw Hash, Salted and/or Iterated", + " 4700 | sha1(md5($pass)) | Raw Hash, Salted and/or Iterated", + " 4900 | sha1($salt.$pass.$salt) | Raw Hash, Salted and/or Iterated", + " 14400 | sha1(CX) | Raw Hash, Salted and/or Iterated", + " 1410 | sha256($pass.$salt) | Raw Hash, Salted and/or Iterated", + " 1420 | sha256($salt.$pass) | Raw Hash, Salted and/or Iterated", + " 1430 | sha256(unicode($pass).$salt) | Raw Hash, Salted and/or Iterated", + " 1440 | sha256($salt.unicode($pass)) | Raw Hash, Salted and/or Iterated", + " 1710 | sha512($pass.$salt) | Raw Hash, Salted and/or Iterated", + " 1720 | sha512($salt.$pass) | Raw Hash, Salted and/or Iterated", + " 1730 | sha512(unicode($pass).$salt) | Raw Hash, Salted and/or Iterated", + " 1740 | sha512($salt.unicode($pass)) | Raw Hash, Salted and/or Iterated", " 50 | HMAC-MD5 (key = $pass) | Raw Hash, Authenticated", " 60 | HMAC-MD5 (key = $salt) | Raw Hash, Authenticated", " 150 | HMAC-SHA1 (key = $pass) | Raw Hash, Authenticated", @@ -175,22 +175,22 @@ static const char *USAGE_BIG[] = " 12000 | PBKDF2-HMAC-SHA1 | Generic KDF", " 10900 | PBKDF2-HMAC-SHA256 | Generic KDF", " 12100 | PBKDF2-HMAC-SHA512 | Generic KDF", - " 23 | Skype | Network protocols", - " 2500 | WPA/WPA2 | Network protocols", - " 4800 | iSCSI CHAP authentication, MD5(Chap) | Network protocols", - " 5300 | IKE-PSK MD5 | Network protocols", - " 5400 | IKE-PSK SHA1 | Network protocols", - " 5500 | NetNTLMv1 | Network protocols", - " 5500 | NetNTLMv1 + ESS | Network protocols", - " 5600 | NetNTLMv2 | Network protocols", - " 7300 | IPMI2 RAKP HMAC-SHA1 | Network protocols", - " 7500 | Kerberos 5 AS-REQ Pre-Auth etype 23 | Network protocols", - " 8300 | DNSSEC (NSEC3) | Network protocols", - " 10200 | Cram MD5 | Network protocols", - " 11100 | PostgreSQL CRAM (MD5) | Network protocols", - " 11200 | MySQL CRAM (SHA1) | Network protocols", - " 11400 | SIP digest authentication (MD5) | Network protocols", - " 13100 | Kerberos 5 TGS-REP etype 23 | Network protocols", + " 23 | Skype | Network Protocols", + " 2500 | WPA/WPA2 | Network Protocols", + " 4800 | iSCSI CHAP authentication, MD5(CHAP) | Network Protocols", + " 5300 | IKE-PSK MD5 | Network Protocols", + " 5400 | IKE-PSK SHA1 | Network Protocols", + " 5500 | NetNTLMv1 | Network Protocols", + " 5500 | NetNTLMv1 + ESS | Network Protocols", + " 5600 | NetNTLMv2 | Network Protocols", + " 7300 | IPMI2 RAKP HMAC-SHA1 | Network Protocols", + " 7500 | Kerberos 5 AS-REQ Pre-Auth etype 23 | Network Protocols", + " 8300 | DNSSEC (NSEC3) | Network Protocols", + " 10200 | CRAM-MD5 | Network Protocols", + " 11100 | PostgreSQL CRAM (MD5) | Network Protocols", + " 11200 | MySQL CRAM (SHA1) | Network Protocols", + " 11400 | SIP digest authentication (MD5) | Network Protocols", + " 13100 | Kerberos 5 TGS-REP etype 23 | Network Protocols", " 121 | SMF (Simple Machines Forum) | Forums, CMS, E-Commerce, Frameworks", " 400 | phpBB3 | Forums, CMS, E-Commerce, Frameworks", " 2611 | vBulletin < v3.8.5 | Forums, CMS, E-Commerce, Frameworks", @@ -199,8 +199,8 @@ static const char *USAGE_BIG[] = " 2811 | IPB (Invison Power 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", - " 400 | Joomla > 2.5.18 | Forums, CMS, E-Commerce, Frameworks", - " 400 | Wordpress | Forums, CMS, E-Commerce, Frameworks", + " 400 | Joomla >= 2.5.18 | Forums, CMS, E-Commerce, Frameworks", + " 400 | WordPress | Forums, CMS, E-Commerce, Frameworks", " 2612 | PHPS | Forums, CMS, E-Commerce, Frameworks", " 7900 | Drupal7 | Forums, CMS, E-Commerce, Frameworks", " 21 | osCommerce | Forums, CMS, E-Commerce, Frameworks", @@ -208,24 +208,24 @@ static const char *USAGE_BIG[] = " 11000 | PrestaShop | Forums, CMS, E-Commerce, Frameworks", " 124 | Django (SHA-1) | Forums, CMS, E-Commerce, Frameworks", " 10000 | Django (PBKDF2-SHA256) | Forums, CMS, E-Commerce, Frameworks", - " 3711 | Mediawiki B type | Forums, CMS, E-Commerce, Frameworks", + " 3711 | MediaWiki B type | Forums, CMS, E-Commerce, Frameworks", " 13900 | OpenCart | Forums, CMS, E-Commerce, Frameworks", " 4521 | Redmine | Forums, CMS, E-Commerce, Frameworks", " 4522 | PunBB | Forums, CMS, E-Commerce, Frameworks", " 12001 | Atlassian (PBKDF2-HMAC-SHA1) | Forums, CMS, E-Commerce, Frameworks", " 12 | PostgreSQL | Database Server", - " 131 | MSSQL(2000) | Database Server", - " 132 | MSSQL(2005) | Database Server", - " 1731 | MSSQL(2012) | Database Server", - " 1731 | MSSQL(2014) | Database Server", + " 131 | MSSQL (2000) | Database Server", + " 132 | MSSQL (2005) | Database Server", + " 1731 | MSSQL (2012) | Database Server", + " 1731 | MSSQL (2014) | Database Server", " 200 | MySQL323 | Database Server", " 300 | MySQL4.1/MySQL5 | Database Server", " 3100 | Oracle H: Type (Oracle 7+) | Database Server", " 112 | Oracle S: Type (Oracle 11+) | Database Server", " 12300 | Oracle T: Type (Oracle 12+) | Database Server", " 8000 | Sybase ASE | Database Server", - " 141 | EPiServer 6.x < v4 | HTTP, SMTP, LDAP Server", - " 1441 | EPiServer 6.x > v4 | HTTP, SMTP, LDAP Server", + " 141 | Episerver 6.x < v4 | HTTP, SMTP, LDAP Server", + " 1441 | Episerver 6.x > v4 | HTTP, SMTP, LDAP Server", " 1600 | Apache $apr1$ | HTTP, SMTP, LDAP Server", " 12600 | ColdFusion 10+ | HTTP, SMTP, LDAP Server", " 1421 | hMailServer | HTTP, SMTP, LDAP Server", @@ -235,41 +235,41 @@ static const char *USAGE_BIG[] = " 1711 | SSHA-512(Base64), LDAP {SSHA512} | HTTP, SMTP, LDAP Server", " 15000 | FileZilla Server >= 0.9.55 | FTP Server", " 11500 | CRC32 | Checksums", - " 3000 | LM | Operating-Systems", - " 1000 | NTLM | Operating-Systems", - " 1100 | Domain Cached Credentials (DCC), MS Cache | Operating-Systems", - " 2100 | Domain Cached Credentials 2 (DCC2), MS Cache 2 | Operating-Systems", - " 12800 | MS-AzureSync PBKDF2-HMAC-SHA256 | Operating-Systems", - " 1500 | descrypt, DES(Unix), Traditional DES | Operating-Systems", - " 12400 | BSDiCrypt, Extended DES | Operating-Systems", - " 500 | md5crypt $1$, MD5(Unix) | Operating-Systems", - " 3200 | bcrypt $2*$, Blowfish(Unix) | Operating-Systems", - " 7400 | sha256crypt $5$, SHA256(Unix) | Operating-Systems", - " 1800 | sha512crypt $6$, SHA512(Unix) | Operating-Systems", - " 122 | OSX v10.4, OSX v10.5, OSX v10.6 | Operating-Systems", - " 1722 | OSX v10.7 | Operating-Systems", - " 7100 | OSX v10.8, OSX v10.9, OSX v10.10 | Operating-Systems", - " 6300 | AIX {smd5} | Operating-Systems", - " 6700 | AIX {ssha1} | Operating-Systems", - " 6400 | AIX {ssha256} | Operating-Systems", - " 6500 | AIX {ssha512} | Operating-Systems", - " 2400 | Cisco-PIX | Operating-Systems", - " 2410 | Cisco-ASA | Operating-Systems", - " 500 | Cisco-IOS $1$ | Operating-Systems", - " 5700 | Cisco-IOS $4$ | Operating-Systems", - " 9200 | Cisco-IOS $8$ | Operating-Systems", - " 9300 | Cisco-IOS $9$ | 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", - " 8100 | Citrix Netscaler | Operating-Systems", - " 8500 | RACF | Operating-Systems", - " 7200 | GRUB 2 | Operating-Systems", - " 9900 | Radmin2 | Operating-Systems", - " 125 | ArubaOS | Operating-Systems", + " 3000 | LM | Operating Systems", + " 1000 | NTLM | Operating Systems", + " 1100 | Domain Cached Credentials (DCC), MS Cache | Operating Systems", + " 2100 | Domain Cached Credentials 2 (DCC2), MS Cache 2 | Operating Systems", + " 12800 | MS-AzureSync PBKDF2-HMAC-SHA256 | Operating Systems", + " 1500 | descrypt, DES(Unix), Traditional DES | Operating Systems", + " 12400 | BSDiCrypt, Extended DES | Operating Systems", + " 500 | md5crypt $1$, MD5(Unix) | Operating Systems", + " 3200 | bcrypt $2*$, Blowfish(Unix) | Operating Systems", + " 7400 | sha256crypt $5$, SHA256(Unix) | Operating Systems", + " 1800 | sha512crypt $6$, SHA512(Unix) | Operating Systems", + " 122 | OSX v10.4, OSX v10.5, OSX v10.6 | Operating Systems", + " 1722 | OSX v10.7 | Operating Systems", + " 7100 | OSX v10.8, OSX v10.9, OSX v10.10 | Operating Systems", + " 6300 | AIX {smd5} | Operating Systems", + " 6700 | AIX {ssha1} | Operating Systems", + " 6400 | AIX {ssha256} | Operating Systems", + " 6500 | AIX {ssha512} | Operating Systems", + " 2400 | Cisco-PIX | Operating Systems", + " 2410 | Cisco-ASA | Operating Systems", + " 500 | Cisco-IOS $1$ | Operating Systems", + " 5700 | Cisco-IOS $4$ | Operating Systems", + " 9200 | Cisco-IOS $8$ | Operating Systems", + " 9300 | Cisco-IOS $9$ | 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", + " 8100 | Citrix NetScaler | Operating Systems", + " 8500 | RACF | Operating Systems", + " 7200 | GRUB 2 | Operating Systems", + " 9900 | Radmin2 | Operating Systems", + " 125 | ArubaOS | Operating Systems", " 7700 | SAP CODVN B (BCODE) | Enterprise Application Software (EAS)", " 7800 | SAP CODVN F/G (PASSCODE) | Enterprise Application Software (EAS)", " 10300 | SAP CODVN H (PWDSALTEDHASH) iSSHA-1 | Enterprise Application Software (EAS)", @@ -282,46 +282,46 @@ static const char *USAGE_BIG[] = " 12500 | RAR3-hp | Archives", " 13000 | RAR5 | Archives", " 13200 | AxCrypt | Archives", - " 13300 | AxCrypt in memory SHA1 | Archives", + " 13300 | AxCrypt in-memory SHA1 | Archives", " 13600 | WinZip | Archives", " 14700 | iTunes Backup < 10.0 | Backup", " 14800 | iTunes Backup >= 10.0 | Backup", - " 62XY | TrueCrypt | Full-Disk encryptions (FDE)", - " X | 1 = PBKDF2-HMAC-RipeMD160 | Full-Disk encryptions (FDE)", - " X | 2 = PBKDF2-HMAC-SHA512 | Full-Disk encryptions (FDE)", - " X | 3 = PBKDF2-HMAC-Whirlpool | Full-Disk encryptions (FDE)", - " X | 4 = PBKDF2-HMAC-RipeMD160 + boot-mode | Full-Disk encryptions (FDE)", - " Y | 1 = XTS 512 bit pure AES | Full-Disk encryptions (FDE)", - " Y | 1 = XTS 512 bit pure Serpent | Full-Disk encryptions (FDE)", - " Y | 1 = XTS 512 bit pure Twofish | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit pure AES | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit pure Serpent | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit pure Twofish | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit cascaded AES-Twofish | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit cascaded Serpent-AES | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit cascaded Twofish-Serpent | Full-Disk encryptions (FDE)", - " Y | 3 = XTS 1536 bit all | Full-Disk encryptions (FDE)", - " 8800 | Android FDE < v4.3 | Full-Disk encryptions (FDE)", - " 12900 | Android FDE (Samsung DEK) | Full-Disk encryptions (FDE)", - " 12200 | eCryptfs | Full-Disk encryptions (FDE)", - " 137XY | VeraCrypt | Full-Disk encryptions (FDE)", - " X | 1 = PBKDF2-HMAC-RipeMD160 | Full-Disk encryptions (FDE)", - " X | 2 = PBKDF2-HMAC-SHA512 | Full-Disk encryptions (FDE)", - " X | 3 = PBKDF2-HMAC-Whirlpool | Full-Disk encryptions (FDE)", - " X | 4 = PBKDF2-HMAC-RipeMD160 + boot-mode | Full-Disk encryptions (FDE)", - " X | 5 = PBKDF2-HMAC-SHA256 | Full-Disk encryptions (FDE)", - " X | 6 = PBKDF2-HMAC-SHA256 + boot-mode | Full-Disk encryptions (FDE)", - " Y | 1 = XTS 512 bit pure AES | Full-Disk encryptions (FDE)", - " Y | 1 = XTS 512 bit pure Serpent | Full-Disk encryptions (FDE)", - " Y | 1 = XTS 512 bit pure Twofish | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit pure AES | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit pure Serpent | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit pure Twofish | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit cascaded AES-Twofish | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit cascaded Serpent-AES | Full-Disk encryptions (FDE)", - " Y | 2 = XTS 1024 bit cascaded Twofish-Serpent | Full-Disk encryptions (FDE)", - " Y | 3 = XTS 1536 bit all | Full-Disk encryptions (FDE)", - " 14600 | LUKS | Full-Disk encryptions (FDE)", + " 62XY | TrueCrypt | Full-Disk Encryption (FDE)", + " X | 1 = PBKDF2-HMAC-RipeMD160 | Full-Disk Encryption (FDE)", + " X | 2 = PBKDF2-HMAC-SHA512 | Full-Disk Encryption (FDE)", + " X | 3 = PBKDF2-HMAC-Whirlpool | 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 Serpent | Full-Disk Encryption (FDE)", + " Y | 1 = XTS 512 bit pure Twofish | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit pure AES | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit pure Serpent | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit pure Twofish | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit cascaded AES-Twofish | 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 | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)", + " 8800 | Android FDE < v4.3 | Full-Disk Encryption (FDE)", + " 12900 | Android FDE (Samsung DEK) | Full-Disk Encryption (FDE)", + " 12200 | eCryptfs | Full-Disk Encryption (FDE)", + " 137XY | VeraCrypt | Full-Disk Encryption (FDE)", + " X | 1 = PBKDF2-HMAC-RipeMD160 | Full-Disk Encryption (FDE)", + " X | 2 = PBKDF2-HMAC-SHA512 | 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 | 5 = PBKDF2-HMAC-SHA256 | 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 Serpent | Full-Disk Encryption (FDE)", + " Y | 1 = XTS 512 bit pure Twofish | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit pure AES | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit pure Serpent | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit pure Twofish | Full-Disk Encryption (FDE)", + " Y | 2 = XTS 1024 bit cascaded AES-Twofish | 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 | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)", + " 14600 | LUKS | Full-Disk Encryption (FDE)", " 9700 | MS Office <= 2003 $0|$1, MD5 + RC4 | Documents", " 9710 | MS Office <= 2003 $0|$1, MD5 + RC4, collider #1 | Documents", " 9720 | MS Office <= 2003 $0|$1, MD5 + RC4, collider #2 | Documents", @@ -339,12 +339,12 @@ static const char *USAGE_BIG[] = " 10700 | PDF 1.7 Level 8 (Acrobat 10 - 11) | Documents", " 9000 | Password Safe v2 | Password Managers", " 5200 | Password Safe v3 | Password Managers", - " 6800 | Lastpass + Lastpass sniffed | Password Managers", + " 6800 | LastPass + LastPass sniffed | Password Managers", " 6600 | 1Password, agilekeychain | Password Managers", " 8200 | 1Password, cloudkeychain | Password Managers", " 11300 | Bitcoin/Litecoin wallet.dat | Password Managers", " 12700 | Blockchain, My Wallet | Password Managers", - " 13400 | Keepass 1 (AES/Twofish) and Keepass 2 (AES) | Password Managers", + " 13400 | KeePass 1 (AES/Twofish) and KeePass 2 (AES) | Password Managers", " 99999 | Plaintext | Plaintext", "", "- [ Outfile Formats ] -", @@ -426,10 +426,10 @@ static const char *USAGE_BIG[] = " Brute-Force | MD5 | %s -a 3 -m 0 example0.hash ?a?a?a?a?a?a", " Combinator | MD5 | %s -a 1 -m 0 example0.hash example.dict example.dict", "", - "If you still have no idea what just happened try following pages:", + "If you still have no idea what just happened, try the following pages:", "", "* https://hashcat.net/wiki/#howtos_videos_papers_articles_etc_in_the_wild", - "* https://hashcat.net/wiki/#frequently_asked_questions", + "* https://hashcat.net/faq/", NULL };