Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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:08:08 +00:00
parent c3be11aac3
commit 9bfbe61961
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_ssl.py
View File

@ -95,6 +95,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)
def test_openssl_version(self): def test_openssl_version(self):
n = ssl.OPENSSL_VERSION_NUMBER n = ssl.OPENSSL_VERSION_NUMBER

1
Misc/ACKS
View File

@ -788,6 +788,7 @@ Michael Urman
Hector Urtubia Hector Urtubia
Andi Vajda Andi Vajda
Case Van Horsen Case Van Horsen
Kyle VanderBeek
Atul Varma Atul Varma
Dmitry Vasiliev Dmitry Vasiliev
Alexandre Vassalotti Alexandre Vassalotti