in upstream, allowing for empty NSEC3 salt

ok sebastia@
This commit is contained in:
otto 2023-01-24 14:20:29 +00:00
parent a3a24ba5a1
commit 26de2db273
2 changed files with 25 additions and 0 deletions

View File

@ -4,6 +4,7 @@ FIX_EXTRACT_PERMISSIONS=Yes
V = 1.9.0
JV = 1
REVISION = 0
EXTRACT_SUFX = .tar.xz
DISTNAME = john-$V-jumbo-${JV}

View File

@ -0,0 +1,24 @@
Index: src/nsec3_fmt_plug.c
--- src/nsec3_fmt_plug.c.orig
+++ src/nsec3_fmt_plug.c
@@ -67,6 +67,11 @@ struct salt_t {
static struct fmt_tests tests[] = {
{ "$NSEC3$100$4141414141414141$8c2d583acbe22616c69bb457e0c2111ced0a6e77$example.com.", "www" },
{ "$NSEC3$100$42424242$8fb38d13720815ed5b5fcefd973e0d7c3906ab02$example.com.", "mx" },
+ { "$NSEC3$0$$879ffda85c7cb08df1f93fb040b90a6869b205f1$example.com.", "ns1" },
+ { "$NSEC3$0$$c5e4b4da1e5a620ddaa3635e55c3732a5b49c7f4$example.com.", "" },
+ { "$NSEC3$1$$4ff4345669d70dc0ab7e76c230d97de3eff75059$example.com.", "" },
+ { "$NSEC3$0$42$e2d9498245ee0768923c1cd523959f18acbf11e7$example.com.", "ns2" },
+ { "$NSEC3$1$42$26d83a84e2dff76c714f4e76b60355adeb045bbe$example.com.", "cdn" },
{ NULL }
};
@@ -175,7 +180,7 @@ static int valid(char *ciphertext, struct fmt_main *pF
return 0;
strncpy(salt, p, q - p);
salt[q - p] = 0;
- if (!ishexlc(salt))
+ if (q-p > 0 && !ishexlc(salt))
return 0;
break;
case 3: