Changeset d199ced for fedd/fedd_util.py

Timestamp:

Oct 14, 2008 5:35:15 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

3925b50

Parents:

0b466d1

Message:

upgrade

File:

• fedd/fedd_util.py (modified) (4 diffs)

fedd/fedd_util.py

@@ -286 +286 @@
 
 
-def generate_fedid(subj, bits=2048, log=None, dir=None, trace=None):
+def generate_fedid(subj, bits=2048, log=None, dir=None, trace=sys.stderr):
     """
     Create a new certificate and derive a fedid from it.
@@ -302 +302 @@
                     suffix=".pem")
 
-            cmd = ["openssl", "req", "-text", "-newkey", "rsa:%d" % bits, 
-                    "-keyout", keypath,  "-nodes", "-subj", "/CN=%s" % subj,
-                    "-x509", "-days", "30", "-out", certpath]
+            cmd = ["/usr/bin/openssl", "req", "-text", "-newkey", 
+                    "rsa:%d" % bits, "-keyout", keypath,  "-nodes", 
+                    "-subj", "/CN=%s" % subj, "-x509", "-days", "30", 
+                    "-out", certpath]
 
             if log:
@@ -310 +311 @@
 
             if trace: call_out = trace
-            else: call_out = open("/dev/null", "w")
+            else: 
+                log.debug("set to dev/null")
+                call_out = open("/dev/null", "w")
 
             rv = subprocess.call(cmd, stdout=call_out, stderr=call_out)
+            log.debug("rv = %d" % rv)
             if rv == 0:
                 cert = ""
@@ -323 +327 @@
                 return (fid, cert)
             else:
-                return None
+                return (None, None)
         except IOError, e:
             raise e