Merged revisions 80559 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80559 | antoine.pitrou | 2010-04-28 00:08:08 +0200 (mer., 28 avril 2010) | 12 lines

  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 da30c4433d5ea636f134d13347509423966a2e88..042d1797ba591e7878f00560ad954b1c14b9b8d8 100644 (file)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -98,6 +98,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)
 
     @support.cpython_only
     def test_refcycle(self):

diff --git a/Misc/ACKS b/Misc/ACKS
index b8d1dee65ead9a7f2e7f8fdba373fb63257ddc81..c5ecfa2c356d39dac2c5b47039c32b781a6b8dfe 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -766,6 +766,7 @@ Roger Upole
 Michael Urman
 Hector Urtubia
 Andi Vajda
+Kyle VanderBeek
 Atul Varma
 Dmitry Vasiliev
 Alexandre Vassalotti