diff options
author | Rob Austein <sra@hactrn.net> | 2010-02-20 07:37:45 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2010-02-20 07:37:45 +0000 |
commit | 58a7ec6bbd8e2d2938c980d3d91943183146ee83 (patch) | |
tree | 51631ecb7d77ee3e3a0cb6a35b9853f40e6d359c /myrpki.rototill/myrpki.py | |
parent | 3f23e4bd922de85eff79542a5b95cae0b29bf840 (diff) |
Checkpoint
svn path=/myrpki.rototill/initialize.py; revision=2989
Diffstat (limited to 'myrpki.rototill/myrpki.py')
-rw-r--r-- | myrpki.rototill/myrpki.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py index 5466ef8d..9509e85e 100644 --- a/myrpki.rototill/myrpki.py +++ b/myrpki.rototill/myrpki.py @@ -516,16 +516,20 @@ class CA(object): self.run_ca("-extensions", "ca_x509_ext_ee", "-in", req_file, "-out", cer_file) return req_file, cer_file - - def fxcert(self, filename, cert, path_restriction = 0): + + def fxcert(self, pem, filename = None, path_restriction = 0): """ Write PEM certificate to file, then cross-certify. """ - fn = os.path.join(self.dir, filename) - f = open(fn, "w") - f.write(cert) - f.close() - return self.xcert(fn, path_restriction) + fn = os.path.join(self.dir, filename or "temp.%s.cer" % os.getpid()) + try: + f = open(fn, "w") + f.write(pem) + f.close() + return self.xcert(fn, path_restriction) + finally: + if not filename and os.path.exists(fn): + os.unlink(fn) def xcert(self, cert, path_restriction = 0): """ |