From 19b14200c9900236c3cdad290013732032e95e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20B=C3=A9guier?= <nicolas.beguier@adevinta.com>
Date: Sat, 6 Nov 2021 20:21:28 +0100
Subject: [PATCH 1/2] Update combinator.rule to use an up-to-date year suffix

---
 rules/combinator.rule | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/rules/combinator.rule b/rules/combinator.rule
index fc2c8636b..67cbf0529 100644
--- a/rules/combinator.rule
+++ b/rules/combinator.rule
@@ -22,9 +22,12 @@ c T7
 l $1
 l $2
 l $1$2$3
-l $2$0$0$7
-l $2$0$0$8
-l $2$0$0$9
+l $2$0$1$7
+l $2$0$1$6
+l $2$0$1$8
+l $2$0$1$9
+l $2$0$2$0
+l $2$0$2$1
 
 ## rule: hyphen variety
 ## limits: insert at char positions 3 to 7

From ef83575c8f9d4a957df1e93c5d2251f9e875b510 Mon Sep 17 00:00:00 2001
From: Jarle Thorsen <jarlethorsen@gmail.com>
Date: Mon, 8 Nov 2021 09:44:48 +0100
Subject: [PATCH 2/2] Increases the maximum value for s2k-count. The maximum
 s2k-count value is 65011712 according to the PGP spec. Increating this value
 fixes a salt iteration exception for hashes with non-default value for
 s2k-count. (Fix successfully tested with a hash with 62914560 s2k-count.)

---
 src/modules/module_17010.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/module_17010.c b/src/modules/module_17010.c
index fd9230c02..1438dcb9c 100644
--- a/src/modules/module_17010.c
+++ b/src/modules/module_17010.c
@@ -280,7 +280,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   const u32 salt_iter = hc_strtoul ((const char *) token.buf[11], NULL, 10);
 
-  if (salt_iter < 8 || salt_iter > 1000000) return (PARSER_SALT_ITERATION);
+  if (salt_iter < 8 || salt_iter > 65011712) return (PARSER_SALT_ITERATION);
 
   salt->salt_iter = salt_iter;