Merged revisions 80557 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  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/ssl.py b/Lib/ssl.py
index 1af9fa9285f748103431ddf78437ff6d997ec812..3c0783fadd40e0af20dc8c59e86d17e2e1f46e56 100644 (file)
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -361,7 +361,7 @@ def DER_cert_to_PEM_cert(der_cert_bytes):
         # preferred because older API gets line-length wrong
         f = base64.standard_b64encode(der_cert_bytes)
         return (PEM_HEADER + '\n' +
-                textwrap.fill(f, 64) +
+                textwrap.fill(f, 64) + '\n' +
                 PEM_FOOTER + '\n')
     else:
         return (PEM_HEADER + '\n' +

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index cc04f4c54c694f987e08eae46737dfb6c1d6b8d2..e5f4a9ed866ee7116ba10e29a848e0a278f21457 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -116,6 +116,10 @@ class BasicTests(unittest.TestCase):
         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_refcycle(self):
         # Issue #7943: an SSL object doesn't create reference cycles with

diff --git a/Misc/ACKS b/Misc/ACKS
index 09de7aae128b12c6fb2c811d4537d6eaa4fd5f2d..c324936bb9b85a5c0417cb2f3c92a776f84d3443 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -734,6 +734,7 @@ Lionel Ulmer
 Roger Upole
 Michael Urman
 Hector Urtubia
+Kyle VanderBeek
 Atul Varma
 Dmitry Vasiliev
 Alexandre Vassalotti

diff --git a/Misc/NEWS b/Misc/NEWS
index 359a3c34612ae822772b74de94e22e8c57529c68..ea1f7ec80c63b47feb6ab28877fcc684d779357f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #8086: In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
+  before the certificate footer.  Patch by Kyle VanderBeek.
+
 - Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
   Sridhar Ratnakumar.