openstack/deb-python-pysaml2
Code Issues Proposed changes

Fix certificate extraction

Browse Source
This commit is contained in:
Patrick Uiterwijk
2014-07-13 21:59:40 -04:00
parent 6b13b16e6b
commit 21403ceae2
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/saml2/sigver.py
View File

@@ -1058,13 +1058,19 @@ def encrypt_cert_from_item(item):
certs = cert_from_instance(item)
if len(certs) > 0:
_encrypt_cert = certs[0]
if _encrypt_cert is not None:
if _encrypt_cert.find("-----BEGIN CERTIFICATE-----\n") == -1:
_encrypt_cert = "-----BEGIN CERTIFICATE-----\n" + _encrypt_cert
if _encrypt_cert.find("-----END CERTIFICATE-----\n") == -1:
_encrypt_cert = _encrypt_cert + "-----END CERTIFICATE-----\n"
except Exception:
return None
pass
if _encrypt_cert is None:
certs = cert_from_instance(item)
if len(certs) > 0:
_encrypt_cert = certs[0]
if _encrypt_cert is not None:
if _encrypt_cert.find("-----BEGIN CERTIFICATE-----\n") == -1:
_encrypt_cert = "-----BEGIN CERTIFICATE-----\n" + _encrypt_cert
if _encrypt_cert.find("\n-----END CERTIFICATE-----") == -1:
_encrypt_cert = _encrypt_cert + "\n-----END CERTIFICATE-----"
return _encrypt_cert
@@ -1825,4 +1831,4 @@ if __name__ == '__main__':
args = parser.parse_args()
if args.listsigalgs:
print '\n'.join([key for key, value in SIGNER_ALGS.items()])
print '\n'.join([key for key, value in SIGNER_ALGS.items()])