diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-11-23 21:16:25 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-11-23 21:16:25 +0000 |
| commit | 1638e71c4442187a315f44840453ad14cafb36ac (patch) | |
| tree | ee2498f9b36b8f532f16fb96303969c530ac81c0 /nova/crypto.py | |
| parent | e59e7e9c3ad3e25545555986dcce0c384f9a7b6e (diff) | |
| download | nova-1638e71c4442187a315f44840453ad14cafb36ac.tar.gz nova-1638e71c4442187a315f44840453ad14cafb36ac.tar.xz nova-1638e71c4442187a315f44840453ad14cafb36ac.zip | |
the serial returned by x509 is already formatted in hex
Diffstat (limited to 'nova/crypto.py')
| -rw-r--r-- | nova/crypto.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/crypto.py b/nova/crypto.py index 9e29f0b8d..a438d232b 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -196,10 +196,7 @@ def generate_x509_cert(user_id, project_id, bits=1024): csr = open(csrfile).read() shutil.rmtree(tmpdir) (serial, signed_csr) = sign_csr(csr, project_id) - strserial = "%X" % serial - if(len(strserial) % 2): - strserial = "0%s" % strserial - fname = os.path.join(ca_folder(project_id), "newcerts/%s.pem" % strserial) + fname = os.path.join(ca_folder(project_id), "newcerts/%s.pem" % serial) cert = {'user_id': user_id, 'project_id': project_id, 'file_name': fname} @@ -261,7 +258,7 @@ def _sign_csr(csr_text, ca_folder): utils.execute("openssl ca -batch -out %s -config " "./openssl.cnf -infiles %s" % (outbound, inbound)) out, _err = utils.execute("openssl x509 -in %s -serial -noout" % outbound) - serial = int(out.rpartition("=")[2]) + serial = out.rpartition("=")[2] os.chdir(start) with open(outbound, "r") as crtfile: return (serial, crtfile.read()) |