From dc7e8674e92ba58840276499111b73b5c2ff6fbc Mon Sep 17 00:00:00 2001 From: Alexandre ZANNI <16578570+noraj@users.noreply.github.com> Date: Tue, 15 Oct 2019 18:50:37 +0200 Subject: [PATCH 1/2] escape dash Avoid this kind of warning in regexp parser warning: character class has '-' without escape --- prototypes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prototypes.json b/prototypes.json index 9aefedf..d35b163 100644 --- a/prototypes.json +++ b/prototypes.json @@ -1739,7 +1739,7 @@ ] }, { - "regex": "^[a-f0-9]{32}:[0-9]+:[a-z0-9_.+-]+@[a-z0-9-]+\\.[a-z0-9-.]+$", + "regex": "^[a-f0-9]{32}:[0-9]+:[a-z0-9_.+\\-]+@[a-z0-9\\-]+\\.[a-z0-9\\-.]+$", "modes": [ { "john": null, @@ -1882,7 +1882,7 @@ ] }, { - "regex": "^\\$p5k2\\$[0-9]+\\$[a-z0-9\\/+=-]+\\$[a-z0-9\\/+-]{27}=$", + "regex": "^\\$p5k2\\$[0-9]+\\$[a-z0-9\\/+=\\-]+\\$[a-z0-9\\/+\\-]{27}=$", "modes": [ { "john": null, @@ -2214,7 +2214,7 @@ ] }, { - "regex": "^\\$cram_md5\\$[a-z0-9\\/+=-]+\\$[a-z0-9\\/+=-]{52}$", + "regex": "^\\$cram_md5\\$[a-z0-9\\/+=\\-]+\\$[a-z0-9\\/+=\\-]{52}$", "modes": [ { "john": null, From 0a0f2fed931a99a6ebe449461633d21fcd1be803 Mon Sep 17 00:00:00 2001 From: Alexandre ZANNI <16578570+noraj@users.noreply.github.com> Date: Tue, 15 Oct 2019 18:55:28 +0200 Subject: [PATCH 2/2] escape dash --- prototypes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prototypes.json b/prototypes.json index d35b163..6debe63 100644 --- a/prototypes.json +++ b/prototypes.json @@ -1772,7 +1772,7 @@ ] }, { - "regex": "^[a-z0-9]{32}(:([a-z0-9-]+\\.)?[a-z0-9-.]+\\.[a-z]{2,7}:.+:[0-9]+)?$", + "regex": "^[a-z0-9]{32}(:([a-z0-9\\-]+\\.)?[a-z0-9\\-.]+\\.[a-z]{2,7}:.+:[0-9]+)?$", "modes": [ { "john": null, @@ -2346,7 +2346,7 @@ ] }, { - "regex": "^\\$pdf\\$[24]\\*[34]\\*128\\*[0-9-]{1,5}\\*1\\*(16|32)\\*[a-f0-9]{32,64}\\*32\\*[a-f0-9]{64}\\*(8|16|32)\\*[a-f0-9]{16,64}$", + "regex": "^\\$pdf\\$[24]\\*[34]\\*128\\*[0-9\\-]{1,5}\\*1\\*(16|32)\\*[a-f0-9]{32,64}\\*32\\*[a-f0-9]{64}\\*(8|16|32)\\*[a-f0-9]{16,64}$", "modes": [ { "john": "pdf",