diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-02-01 14:00:28 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-02-02 14:02:46 -0500 |
| commit | dc55240fe8ce2f27aaca05a5287089080c902c85 (patch) | |
| tree | 684f7a6d20927fc519dea6652536922d1f08bed2 /ipaserver/install/service.py | |
| parent | 8ca97cdf3541adefe11ca0fc4ac49f01e8fb6984 (diff) | |
| download | freeipa-dc55240fe8ce2f27aaca05a5287089080c902c85.tar.gz freeipa-dc55240fe8ce2f27aaca05a5287089080c902c85.tar.xz freeipa-dc55240fe8ce2f27aaca05a5287089080c902c85.zip | |
Be more careful when base64-decoding certificates
Only decode certs that have a BEGIN/END block, otherwise assume it
is in DER format.
Diffstat (limited to 'ipaserver/install/service.py')
| -rw-r--r-- | ipaserver/install/service.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 5aee093ec..d9db9ba45 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) |