From ed5931c0c97470b4f6d3a8b1c3d1355f64f0eb7e Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Sun, 23 Jun 2024 16:34:37 -0400
Subject: [PATCH] Fix error in validate_signature_fields which prevented
 signature expiration from being properly evaluated (LP: #2068937)

---
 ChangeLog        | 4 ++++
 dkim/__init__.py | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c815bd..f1fd041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+UNRELEASED Version 1.1.7
+   - Fix error in validate_signature_fields which prevented signature
+     expiration from being properly evaluated (LP: #2068937)
+
 2024-04-14 Version 1.1.6
    - Use raw byte string for regex; fixes SyntaxWarning in Python 3.12 due to
      invalid escape sequence (LP: #2049518)  - Thanks to Simon Chopin for the
diff --git a/dkim/__init__.py b/dkim/__init__.py
index 62971d0..14b2c83 100644
--- a/dkim/__init__.py
+++ b/dkim/__init__.py
@@ -345,10 +345,10 @@ def validate_signature_fields(sig, mandatory_fields=[b'v', b'a', b'b', b'bh', b'
         if x_sign < now - slop:
             raise ValidationError(
                 "x= value is past (%s)" % sig[b'x'])
-            if x_sign < t_sign:
-                raise ValidationError(
-                    "x= value is less than t= value (x=%s t=%s)" %
-                    (sig[b'x'], sig[b't']))
+        if x_sign < t_sign:
+            raise ValidationError(
+                "x= value is less than t= value (x=%s t=%s)" %
+                (sig[b'x'], sig[b't']))
 
 
 def rfc822_parse(message):