Merge branch 'master' of https://github.com/hashcat/hashcat

2016-12-24 00:41:16 +01:00
parent 6ece83760d fa5b5d298d
commit a077a72a4e
5 changed files with 336 additions and 1 deletions
@@ -11,7 +11,8 @@
 bool need_hexify (const u8 *buf, const int len, const char separator, bool always_ascii);
 void exec_hexify (const u8 *buf, const int len, u8 *out);

-bool is_valid_hex_char (const u8 c);
+bool is_valid_hex_string (const u8 *s, const int len);
+bool is_valid_hex_char   (const u8 c);

 u8 hex_convert (const u8 c);

@@ -434,6 +434,8 @@ typedef enum parser_rc
  PARSER_VC_FILE_SIZE        = -16,
  PARSER_SIP_AUTH_DIRECTIVE  = -17,
  PARSER_HASH_FILE           = -18,
+  PARSER_HASH_ENCODING       = -19,
+  PARSER_SALT_ENCODING       = -20,
  PARSER_UNKNOWN_ERROR       = -255

 } parser_rc_t;