diff -Nru m2crypto-0.21.1/debian/changelog m2crypto-0.21.1/debian/changelog
--- m2crypto-0.21.1/debian/changelog	2013-12-18 15:13:25.000000000 +0000
+++ m2crypto-0.21.1/debian/changelog	2014-02-17 23:59:28.000000000 +0000
@@ -1,3 +1,10 @@
+m2crypto (0.21.1-3ubuntu5) trusty; urgency=medium
+
+  * debian/patches/fix_testsuite_sha256.patch: Fix test_write_pkcs7_der to
+    cope with SHA-256 defaults in OpenSSL.
+
+ -- William Grant <wgrant@ubuntu.com>  Tue, 18 Feb 2014 10:58:57 +1100
+
 m2crypto (0.21.1-3ubuntu4) trusty; urgency=medium
 
   * debian/patches/fix_testsuite_tls1.2.patch: Fix SSLv3 test to also disable
diff -Nru m2crypto-0.21.1/debian/patches/fix_testsuite_sha256.patch m2crypto-0.21.1/debian/patches/fix_testsuite_sha256.patch
--- m2crypto-0.21.1/debian/patches/fix_testsuite_sha256.patch	1970-01-01 00:00:00.000000000 +0000
+++ m2crypto-0.21.1/debian/patches/fix_testsuite_sha256.patch	2014-02-17 23:57:52.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Fix test_write_pkcs7_der to cope with SHA-256 defaults
+ OpenSSL now defaults to SHA-256 rather than SHA-1 when writing out
+ PKCS7 as DER, and SHA-256's longer OID increases the size of the
+ output.
+Author: William Grant <wgrant@ubuntu.com>
+
+Index: m2crypto-0.21.1/tests/test_smime.py
+===================================================================
+--- m2crypto-0.21.1.orig/tests/test_smime.py	2014-02-18 10:49:19.080215460 +1100
++++ m2crypto-0.21.1/tests/test_smime.py	2014-02-18 10:49:34.080406466 +1100
+@@ -219,7 +219,7 @@
+         buf = BIO.MemoryBuffer()
+         assert SMIME.load_pkcs7(self.filename).write_der(buf) == 1
+         s = buf.read()
+-        assert len(s) in (1204, 1243, 1525, 1635), len(s)
++        assert len(s) in (1204, 1243, 1525, 1545, 1635), len(s)
+         
+     def test_load_pkcs7(self):
+         assert SMIME.load_pkcs7(self.filename).type() == SMIME.PKCS7_SIGNED
diff -Nru m2crypto-0.21.1/debian/patches/series m2crypto-0.21.1/debian/patches/series
--- m2crypto-0.21.1/debian/patches/series	2013-12-18 15:11:19.000000000 +0000
+++ m2crypto-0.21.1/debian/patches/series	2014-02-17 23:49:28.000000000 +0000
@@ -4,3 +4,4 @@
 skip_sslv2_tests.patch
 fix_testsuite_ftbfs.patch
 fix_testsuite_tls1.2.patch
+fix_testsuite_sha256.patch