diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-26 16:25:51 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-26 16:25:51 -0400 |
| commit | 1030725efae7096409ed9af24a68e4c8b53180dc (patch) | |
| tree | fedd93ff1203eb89954480a70a4e6232e2bcdf63 /func | |
| parent | 7dc50faf68fd3d20691263792dae609ec1cee13b (diff) | |
| download | third_party-func-1030725efae7096409ed9af24a68e4c8b53180dc.tar.gz third_party-func-1030725efae7096409ed9af24a68e4c8b53180dc.tar.xz third_party-func-1030725efae7096409ed9af24a68e4c8b53180dc.zip | |
make it so it doesn't exit when it returns the cert to the client
Diffstat (limited to 'func')
| -rwxr-xr-x | func/certmaster.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/func/certmaster.py b/func/certmaster.py index be10814..58840bb 100755 --- a/func/certmaster.py +++ b/func/certmaster.py @@ -138,8 +138,7 @@ class CertMaster(object): # look for a cert: # if we have it, then return True, etc, etc if os.path.exists(certfile): - slavecert = crypto.load_certificate(crypto.FILETYPE_PEM, certfile) - + slavecert = func.certs.retrieve_cert_from_file(certfile) cert_buf = crypto.dump_certificate(crypto.FILETYPE_PEM, slavecert) cacert_buf = crypto.dump_certificate(crypto.FILETYPE_PEM, self.cacert) return True, cert_buf, cacert_buf @@ -150,7 +149,8 @@ class CertMaster(object): if self.cfg.autosign: cert_fn = self.sign_this_csr(csrreq) - cert_buf = crypto.dump_certificate(crypto.FILETYPE_PEM, cert_fn) + cert = func.certs.retrieve_cert_from_file(cert_fn) + cert_buf = crypto.dump_certificate(crypto.FILETYPE_PEM, cert) cacert_buf = crypto.dump_certificate(crypto.FILETYPE_PEM, self.cacert) return True, cert_buf, cacert_buf |