Fixed conflicts

2017-05-16 20:36:55 -04:00
parent 8b6120243d 2eabc360d7
commit 5683df2e17
13 changed files with 3499 additions and 71 deletions
@@ -6,9 +6,9 @@

 - Added hash-mode   600 = Blake2-512
 - Added hash-mode 15200 = Blockchain, My Wallet, V2
+- Added hash-mode 15300 = DPAPI masterkey file v1 and v2
 - Added hash-mode 15400 = Chacha20

-
 ##
 ## Features
 ##
@@ -31,6 +31,7 @@ Jean-Christophe "Fist0urs" Delaunay <jean-christophe.delaunay@synacktiv.com> (@F
 * Kerberos TGS Rep enctype 23 kernel module
 * AxCrypt kernel module
 * KeePass kernel module
+* DPAPImk v1 and v2 kernel module

 Other contributors to hashcat

@@ -146,6 +146,7 @@ NVIDIA GPUs require "NVIDIA Driver" (367.x or later)
 - NTLM
 - Domain Cached Credentials (DCC), MS Cache
 - Domain Cached Credentials 2 (DCC2), MS Cache 2
+- DPAPI masterkey file v1 and v2
 - MS-AzureSync PBKDF2-HMAC-SHA256
 - descrypt
 - bsdicrypt