mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 80559 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-04-27 22:09:05 +00:00
parent 79ac78afef
commit 00f905e8f2
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_ssl.py
View file

@ -98,6 +98,10 @@ class BasicTests(unittest.TestCase):
p2 = ssl.DER_cert_to_PEM_cert(d1) p2 = ssl.DER_cert_to_PEM_cert(d1)
d2 = ssl.PEM_cert_to_DER_cert(p2) d2 = ssl.PEM_cert_to_DER_cert(p2)
self.assertEqual(d1, d2) 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 @support.cpython_only
def test_refcycle(self): def test_refcycle(self):

1
Misc/ACKS
View file

@ -766,6 +766,7 @@ Roger Upole
Michael Urman Michael Urman
Hector Urtubia Hector Urtubia
Andi Vajda Andi Vajda
Kyle VanderBeek
Atul Varma Atul Varma
Dmitry Vasiliev Dmitry Vasiliev
Alexandre Vassalotti Alexandre Vassalotti