From dc55240fe8ce2f27aaca05a5287089080c902c85 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Mon, 1 Feb 2010 14:00:28 -0500 Subject: Be more careful when base64-decoding certificates Only decode certs that have a BEGIN/END block, otherwise assume it is in DER format. --- ipaserver/install/service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ipaserver/install/service.py') diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 5aee093e..d9db9ba4 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -169,7 +169,7 @@ class Service: e = self.dercert.find('-----END CERTIFICATE-----') s = s + 27 self.dercert = self.dercert[s:e] - self.dercert = base64.b64decode(self.dercert) + self.dercert = base64.b64decode(self.dercert) except Exception: pass dn = "krbprincipalname=%s,cn=services,cn=accounts,%s" % (self.principal, self.suffix) -- cgit