Merge pull request #9 from rvrsh3ll/master

Update to support new hashcat mode 18200

Rubeus/lib/Roast.cs

@@ -57,12 +57,15 @@ namespace Rubeus
                 {
                     hashString = String.Format("$krb5asrep${0}@{1}:{2}", userName, domain, repHash);
                 }
+                else if(format == "hashcat")
+                {
+                    hashString = String.Format("$krb5asrep$23${0}@{1}:{2}", userName, domain, repHash);
+                }
                 else
                 {
-                    // eventual hashcat format
-                    hashString = String.Format("$krb5asrep${0}$*{1}${2}*${3}${4}", (int)Interop.KERB_ETYPE.rc4_hmac, userName, domain, repHash.Substring(0, 32), repHash.Substring(32));
+                  Console.WriteLine("Please provide a cracking format.");
+                    
                 }
-
                 Console.WriteLine("[*] AS-REP hash:\r\n");
 
                 // display the base64 of a hash, columns of 80 chararacters
@@ -306,4 +309,4 @@ namespace Rubeus
             }
         }
     }
-}
+}