Merged revisions 80557 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
(the bug was already fixed in py3k, just merging in the tests)
........
r80557 | antoine.pitrou | 2010-04-28 00:03:37 +0200 (mer., 28 avril 2010) | 4 lines
Issue #8086: In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
before the certificate footer. Patch by Kyle VanderBeek.
........
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 5e659c2..012b8bf 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -95,6 +95,10 @@
p2 = ssl.DER_cert_to_PEM_cert(d1)
d2 = ssl.PEM_cert_to_DER_cert(p2)
self.assertEqual(d1, d2)
+ if not p2.startswith(ssl.PEM_HEADER + '\n'):
+ self.fail("DER-to-PEM didn't include correct header:\n%r\n" % p2)
+ if not p2.endswith('\n' + ssl.PEM_FOOTER + '\n'):
+ self.fail("DER-to-PEM didn't include correct footer:\n%r\n" % p2)
def test_openssl_version(self):
n = ssl.OPENSSL_VERSION_NUMBER
diff --git a/Misc/ACKS b/Misc/ACKS
index 8755409..830d582 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -788,6 +788,7 @@
Hector Urtubia
Andi Vajda
Case Van Horsen
+Kyle VanderBeek
Atul Varma
Dmitry Vasiliev
Alexandre Vassalotti