IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-02 11:41:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

py3: strip_header: support both bytes and unicode

Browse Source 
Various method passed various bytes or unicode as parameter

https://fedorahosted.org/freeipa/ticket/4985

Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Martin Basti 2017-01-19 15:28:15 +01:00
parent 47e76e16ef
commit b8d6524d43
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipalib/x509.py
View File

@ -85,12 +85,16 @@ def strip_header(pem):
"""
Remove the header and footer from a certificate.
"""
s = pem.find("-----BEGIN CERTIFICATE-----")
if s >= 0:
e = pem.find("-----END CERTIFICATE-----")
pem = pem[s+27:e]
return pem
regexp = (
u"^-----BEGIN CERTIFICATE-----(.*?)-----END CERTIFICATE-----"
)
if isinstance(pem, bytes):
regexp = regexp.encode('ascii')
s = re.search(regexp, pem, re.MULTILINE | re.DOTALL)
if s is not None:
return s.group(1)
else:
return pem
def load_certificate(data, datatype=PEM):