From fd0caddf161ccabf0ace313ade6c2cd6323da27a Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Sun, 9 Jun 2013 22:43:29 -0400
Subject: [PATCH] Update for version 0.5.4. Fixed error in FWS regular
 expression that cause some valid signatures fail verification (Thanks to
 Peter Palfrader (weasel) for the patch)

---
 ChangeLog        | 11 ++++++++---
 PKG-INFO         |  2 +-
 README           |  2 +-
 dkim/__init__.py |  3 ++-
 setup.py         |  2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4860ebc..1551193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
-UNRELEASED Version 0.5.3
-    - Make key parsing error messages more specific to help troubleshooting
-      (Based on user feedback)
+2013-06-10 Version 0.5.4
+    - Fixed error in FWS regular expression that cause some valid signatures
+      to fail verification (Thanks to Peter Palfrader (weasel) for the patch)
+      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711751
     - Change dkimsign.py to sign the default (recommended) set of headers
       instead of all headers
 
+2012-10-27 Version 0.5.3
+    - Make key parsing error messages more specific to help troubleshooting
+      based on user feedback
+
 2012-06-13 Version 0.5.2
     - Change canonicalization defaults to work around issues with different
       verification implementations <https://launchpad.net/bugs/939128>
diff --git a/PKG-INFO b/PKG-INFO
index 158ecec..34ee61f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: dkimpy
-Version: 0.5.3
+Version: 0.5.4
 Summary: DKIM (DomainKeys Identified Mail)
 Home-page: https://launchapd.net/dkimpy
 Author: Scott Kitterman
diff --git a/README b/README
index 5ac4adb..85c38b6 100644
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ signing and verification.
 
 VERSION
 
-This is dkimpy 0.5.3.
+This is dkimpy 0.5.4.
 
 REQUIREMENTS
 
diff --git a/dkim/__init__.py b/dkim/__init__.py
index b777deb..36d6fb0 100644
--- a/dkim/__init__.py
+++ b/dkim/__init__.py
@@ -118,7 +118,8 @@ def select_headers(headers, include_headers):
         lastindex[h] = i
     return sign_headers
 
-FWS = r'(?:\r?\n\s+)?'
+# FWS  =  ([*WSP CRLF] 1*WSP) /  obs-FWS ; Folding white space  [RFC5322]
+FWS = r'(?:(?:\s*\r?\n)?\s+)?'
 RE_BTAG = re.compile(r'([;\s]b'+FWS+r'=)(?:'+FWS+r'[a-zA-Z0-9+/=])*(?:\r?\n\Z)?')
 
 def hash_headers(hasher, canonicalize_headers, headers, include_headers,
diff --git a/setup.py b/setup.py
index d92bf57..e4a5787 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
 from distutils.core import setup
 import os
 
-version = "0.5.3"
+version = "0.5.4"
 
 setup(
     name = "dkimpy",