diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 22:05:18 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-27 22:05:18 (GMT) |
| commit | 12cb1297f4c055e70a0d89359030d0051bdeed92 (patch) | |
| tree | 0ea11d1874fd08f0a72ed55f705fd7b29a363347 /Lib/ssl.py | |
| parent | bcc17e7223fe4378127b054aade28a1bfa0536e5 (diff) | |
| download | cpython-12cb1297f4c055e70a0d89359030d0051bdeed92.zip cpython-12cb1297f4c055e70a0d89359030d0051bdeed92.tar.gz cpython-12cb1297f4c055e70a0d89359030d0051bdeed92.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' + |