Changeset 95be336 for fedd

Timestamp:

Oct 7, 2011 1:19:46 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

743a102

Parents:

9bde415

Message:

Use -set_serial instead of fighting the serial directory format #33

File:

• fedd/federation/experiment_control.py (modified) (4 diffs)

fedd/federation/experiment_control.py

@@ -563 +563 @@
         openssl = '/usr/bin/openssl'
         # All the filenames and parameters we need for openssl calls below
-        ca_serial =os.path.join(destdir, 'ca.serial') 
         ca_key =os.path.join(destdir, 'ca.key') 
         ca_pem = os.path.join(destdir, 'ca.pem')
@@ -571 +570 @@
         node_signed = os.path.join(destdir, 'node.signed')
         days = '%s' % (365 * 10)
+        serial = '%s' % random.randint(0, 1<<16)
 
         try:
-            # init a serial number for the openssl calls
-            f = open(ca_serial, 'w')
-            print >>f, '%s' % random.randint(0, 0xffffffff)
-            f.close()
-
             # Sequence of calls to create a CA key, create a ca cert, create a
             # node key, node signing request, and finally a signed node
@@ -591 +586 @@
                         '/C=US/ST=CA/O=DETER/OU=fedd/CN=node' ),
                     (openssl, 'x509', '-CA', ca_pem, '-CAkey', ca_key, 
-                        '-CAserial', ca_serial, '-req', '-in', node_req, 
+                        '-set_serial', serial, '-req', '-in', node_req, 
                         '-out', node_signed, '-days', days),
                 )
@@ -612 +607 @@
 
             # Throw out intermediaries.
-            for fn in (ca_serial, ca_key, node_key, node_req, node_signed):
+            for fn in (ca_key, node_key, node_req, node_signed):
                 os.unlink(fn)