Update docs/readme.txt with new hash-modes

docs/readme.txt

@@ -89,6 +89,7 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - sha1($salt.$pass)
 - sha1($salt.$pass.$salt)
 - sha1($salt.sha1($pass))
+- sha1($salt.sha1($pass.$salt))
 - sha1($salt.utf16le($pass))
 - sha1($salt1.$pass.$salt2)
 - sha1(CX)
@@ -98,15 +99,14 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - sha1(md5(md5($pass)))
 - sha1(sha1($pass))
 - sha1(sha1($pass).$salt)
-- sha1($salt.sha1($pass.$salt))
 - sha1(utf16le($pass).$salt)
 - sha256($pass.$salt)
+- sha256(sha256_bin($pass))
 - sha256($salt.$pass)
 - sha256($salt.$pass.$salt)
 - sha256($salt.utf16le($pass))
 - sha256(md5($pass))
 - sha256(sha256($pass).$salt)
-- sha256(sha256_bin($pass))
 - sha256(utf16le($pass).$salt)
 - sha512($pass.$salt)
 - sha512($salt.$pass)
@@ -145,12 +145,17 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - SIP digest authentication (MD5)
 - IKE-PSK MD5
 - IKE-PSK SHA1
+- XMPP SCRAM PBKDF2-SHA1
+- KNX IP Secure - Device Authentication Code
 - WPA-PBKDF2-PMKID+EAPOL
 - WPA-PMK-PMKID+EAPOL
 - IPMI2 RAKP HMAC-SHA1
 - CRAM-MD5
 - iSCSI CHAP authentication, MD5(CHAP)
 - JWT (JSON Web Token)
+- Telegram Desktop < v2.1.14 (PBKDF2-HMAC-SHA1)
+- Telegram Desktop >= v2.1.14 (PBKDF2-HMAC-SHA512)
+- Telegram Mobile App Passcode (SHA256)
 - Kerberos 5, etype 23, AS-REQ Pre-Auth
 - Kerberos 5, etype 23, TGS-REP
 - Kerberos 5, etype 23, AS-REP
@@ -161,14 +166,8 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - NetNTLMv1 / NetNTLMv1+ESS
 - NetNTLMv2
 - Skype
-- Telegram Desktop <  v2.1.14 (PBKDF2-HMAC-SHA1)
-- Telegram Desktop >= v2.1.14 (PBKDF2-HMAC-SHA512)
-- Telegram Mobile App Passcode (SHA256)
-- MongoDB ServerKey SCRAM-SHA-1
-- MongoDB ServerKey SCRAM-SHA-256
-- MySQL CRAM (SHA1)
 - PostgreSQL CRAM (MD5)
-- XMPP SCRAM
+- MySQL CRAM (SHA1)
 - RACF
 - AIX {smd5}
 - AIX {ssha1}
@@ -202,6 +201,7 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - Cisco-PIX MD5
 - Citrix NetScaler (SHA1)
 - Citrix NetScaler (SHA512)
+- Dahua Authentication MD5
 - Domain Cached Credentials (DCC), MS Cache
 - Domain Cached Credentials 2 (DCC2), MS Cache 2
 - FortiGate (FortiOS)
@@ -209,18 +209,20 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - Juniper IVE
 - Juniper NetScreen/SSG (ScreenOS)
 - Juniper/NetBSD sha1crypt
+- SQLCipher
 - MSSQL (2000)
 - MSSQL (2005)
 - MSSQL (2012, 2014)
+- MongoDB ServerKey SCRAM-SHA-1
+- MongoDB ServerKey SCRAM-SHA-256
 - PostgreSQL
 - Oracle H: Type (Oracle 7+)
 - Oracle S: Type (Oracle 11+)
 - Oracle T: Type (Oracle 12+)
+- MySQL $A$ (sha256crypt)
 - MySQL323
 - MySQL4.1/MySQL5
-- MySQL $A$ (sha256crypt)
 - Sybase ASE
-- SQLCipher
 - hMailServer
 - DNSSEC (NSEC3)
 - CRAM-MD5 Dovecot
@@ -234,6 +236,22 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - Episerver 6.x >= .NET 4
 - nsldap, SHA-1(Base64), Netscape LDAP SHA
 - nsldaps, SSHA-1(Base64), Netscape LDAP SSHA
+- WBB3 (Woltlab Burning Board)
+- vBulletin < v3.8.5
+- vBulletin >= v3.8.5
+- PHPS
+- SMF (Simple Machines Forum) > v1.1
+- MediaWiki B type
+- Redmine
+- Umbraco HMAC-SHA1
+- Joomla < 2.5.18
+- OpenCart
+- PrestaShop
+- Tripcode
+- Drupal7
+- osCommerce, xt:Commerce
+- PunBB
+- MyBB 1.2+, IPB2+ (Invision Power Board)
 - SAP CODVN B (BCODE)
 - SAP CODVN B (BCODE) from RFC_READ_TABLE
 - SAP CODVN F/G (PASSCODE)
@@ -250,17 +268,17 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - Oracle Transportation Management (SHA256)
 - Huawei sha1(md5($pass).$salt)
 - AuthMe sha256
-- AES Crypt (SHA256)
-- BitLocker
 - eCryptfs
+- AES Crypt (SHA256)
 - LUKS
 - VeraCrypt
+- BestCrypt v3 Volume Encryption
 - FileVault 2
 - DiskCryptor
+- BitLocker
 - Android FDE (Samsung DEK)
 - Android FDE <= 4.3
 - Apple File System (APFS)
-- BestCrypt v3 Volume Encryption
 - TrueCrypt
 - PDF 1.1 - 1.3 (Acrobat 2 - 4)
 - PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1
@@ -269,7 +287,6 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - PDF 1.4 - 1.6 (Acrobat 5 - 8) - edit password
 - PDF 1.7 Level 3 (Acrobat 9)
 - PDF 1.7 Level 8 (Acrobat 10 - 11)
-- Apple iWork
 - MS Office 2007
 - MS Office 2010
 - MS Office 2013
@@ -282,25 +299,23 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - MS Office <= 2003 $3, SHA1 + RC4, collider #2
 - Open Document Format (ODF) 1.2 (SHA-256, AES)
 - Open Document Format (ODF) 1.1 (SHA-1, Blowfish)
-- Apple Keychain
 - Apple Secure Notes
-- JKS Java Key Store Private Keys (SHA1)
-- PKCS#8 Private Keys
-- RSA/DSA/EC/OpenSSH Private Keys
+- Apple iWork
 - 1Password, agilekeychain
 - 1Password, cloudkeychain
-- Bitwarden
 - Password Safe v2
 - Password Safe v3
 - LastPass + LastPass sniffed
 - KeePass 1 (AES/Twofish) and KeePass 2 (AES)
 - Bitcoin/Litecoin wallet.dat
+- Bitwarden
 - Electrum Wallet (Salt-Type 1-5)
 - Blockchain, My Wallet
 - Blockchain, My Wallet, V2
 - Blockchain, My Wallet, Second Password (SHA256)
 - Mozilla key3.db
 - Mozilla key4.db
+- Apple Keychain
 - Stargazer Stellar Wallet XLM
 - Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256
 - Ethereum Wallet, PBKDF2-HMAC-SHA256
@@ -318,11 +333,11 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - PKZIP (Uncompressed)
 - PKZIP Master Key
 - PKZIP Master Key (6 byte optimization)
+- iTunes backup < 10.0
+- iTunes backup >= 10.0
 - SecureZIP AES-128
 - SecureZIP AES-192
 - SecureZIP AES-256
-- iTunes backup < 10.0
-- iTunes backup >= 10.0
 - WinZip
 - Android Backup
 - Stuffit5
@@ -330,27 +345,18 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - AxCrypt 1 in-memory SHA1
 - AxCrypt 2 AES-128
 - AxCrypt 2 AES-256
-- WBB3 (Woltlab Burning Board)
-- vBulletin < v3.8.5
-- vBulletin >= v3.8.5
-- PHPS
-- SMF (Simple Machines Forum) > v1.1
-- MediaWiki B type
-- Redmine
-- Umbraco HMAC-SHA1
-- Joomla < 2.5.18
-- OpenCart
-- PrestaShop
-- Tripcode
-- Drupal7
-- osCommerce, xt:Commerce
-- PunBB
-- MyBB 1.2+, IPB2+ (Invision Power Board)
+- TOTP (HMAC-SHA1)
+- Web2py pbkdf2-sha512
 - Django (PBKDF2-SHA256)
 - Django (SHA-1)
-- Web2py pbkdf2-sha512
-- TOTP (HMAC-SHA1)
-- Dahua Authentication MD5
+- PKCS#8 Private Keys (PBKDF2-HMAC-SHA1 + 3DES/AES)
+- PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)
+- JKS Java Key Store Private Keys (SHA1)
+- RSA/DSA/EC/OpenSSH Private Keys ($0$)
+- RSA/DSA/EC/OpenSSH Private Keys ($6$)
+- RSA/DSA/EC/OpenSSH Private Keys ($1, $3$)
+- RSA/DSA/EC/OpenSSH Private Keys ($4$)
+- RSA/DSA/EC/OpenSSH Private Keys ($5$)
 
 ##
 ## Attack-Modes