"Any programmer who fails to comply with the standard naming, formatting,

or commenting conventions should be shot.  If it so happens that it is
inconvenient to shoot him, then he is to be politely requested to recode
his program in adherence to the above standard."
		-- Michael Spier, Digital Equipment Corporation

svn path=/branches/tk705/; revision=6152

1 files changed, 78 insertions, 78 deletions

diff --git a/potpourri/x509-dot.py b/potpourri/x509-dot.py
index 42e1543a..493199fd 100644
--- a/potpourri/x509-dot.py
+++ b/potpourri/x509-dot.py
@@ -36,123 +36,123 @@ import rpki.POW, sys, glob, os
 
 class x509(object):
 
-  ski = None
-  aki = None
+    ski = None
+    aki = None
 
-  show_file    = False
-  show_ski     = False
-  show_aki     = False
-  show_issuer  = True
-  show_subject = True
+    show_file    = False
+    show_ski     = False
+    show_aki     = False
+    show_issuer  = True
+    show_subject = True
 
-  cn_only      = True
+    cn_only      = True
 
-  subjects = {}
+    subjects = {}
 
-  def __init__(self, filename):
+    def __init__(self, filename):
 
-    while filename.startswith("./"):
-      filename = filename[2:]
+        while filename.startswith("./"):
+            filename = filename[2:]
 
-    self.filename = filename
+        self.filename = filename
 
-    f = open(filename, "rb")
-    text = f.read()
-    f.close()
+        f = open(filename, "rb")
+        text = f.read()
+        f.close()
 
-    if "-----BEGIN" in text:
-      self.pow = rpki.POW.X509.pemRead(text)
-    else:
-      self.pow = rpki.POW.X509.derRead(text)
+        if "-----BEGIN" in text:
+            self.pow = rpki.POW.X509.pemRead(text)
+        else:
+            self.pow = rpki.POW.X509.derRead(text)
 
 
-    try:
-      self.ski = ":".join(["%02X" % ord(i) for i in self.pow.getSKI()])
-    except:
-      pass
+        try:
+            self.ski = ":".join(["%02X" % ord(i) for i in self.pow.getSKI()])
+        except:
+            pass
 
-    try:
-      self.aki = ":".join(["%02X" % ord(i) for i in self.pow.getAKI()])      
-    except:
-      pass
+        try:
+            self.aki = ":".join(["%02X" % ord(i) for i in self.pow.getAKI()])
+        except:
+            pass
 
-    self.subject = self.canonize(self.pow.getSubject())
-    self.issuer  = self.canonize(self.pow.getIssuer())
+        self.subject = self.canonize(self.pow.getSubject())
+        self.issuer  = self.canonize(self.pow.getIssuer())
 
-    if self.subject in self.subjects:
-      self.subjects[self.subject].append(self)
-    else:
-      self.subjects[self.subject] = [self]
+        if self.subject in self.subjects:
+            self.subjects[self.subject].append(self)
+        else:
+            self.subjects[self.subject] = [self]
 
-  def canonize(self, name):
+    def canonize(self, name):
 
-    # Probably should just use rpki.x509.X501DN class here.
+        # Probably should just use rpki.x509.X501DN class here.
 
-    try:
-      if self.cn_only and name[0][0][0] == "2.5.4.3":
-        return name[0][0][1]
-    except:
-      pass
+        try:
+            if self.cn_only and name[0][0][0] == "2.5.4.3":
+                return name[0][0][1]
+        except:
+            pass
 
-    return name
+        return name
 
-  def set_node(self, node):
+    def set_node(self, node):
 
-    self.node = node
+        self.node = node
 
-  def dot(self):
+    def dot(self):
 
-    label = []
+        label = []
 
-    if self.show_issuer:
-      label.append(("Issuer", self.issuer))
+        if self.show_issuer:
+            label.append(("Issuer", self.issuer))
 
-    if self.show_subject:
-      label.append(("Subject", self.subject))
+        if self.show_subject:
+            label.append(("Subject", self.subject))
 
-    if self.show_file:
-      label.append(("File", self.filename))
+        if self.show_file:
+            label.append(("File", self.filename))
 
-    if self.show_aki:
-      label.append(("AKI", self.aki))
+        if self.show_aki:
+            label.append(("AKI", self.aki))
 
-    if self.show_ski:
-      label.append(("SKI", self.ski))
+        if self.show_ski:
+            label.append(("SKI", self.ski))
 
-    print "#", repr(label)
+        print "#", repr(label)
 
-    if len(label) > 1:
-      print '%s [shape = record, label = "{%s}"];' % (self.node, "|".join("{%s|%s}" % (x, y) for x, y in label if y is not None))
-    else:
-      print '%s [label = "%s"];' % (self.node, label[0][1])
+        if len(label) > 1:
+            print '%s [shape = record, label = "{%s}"];' % (self.node, "|".join("{%s|%s}" % (x, y) for x, y in label if y is not None))
+        else:
+            print '%s [label = "%s"];' % (self.node, label[0][1])
 
-    for issuer in self.subjects.get(self.issuer, ()):
+        for issuer in self.subjects.get(self.issuer, ()):
 
-      if issuer is self:
-        print "# Issuer is self"
-        issuer = None
+            if issuer is self:
+                print "# Issuer is self"
+                issuer = None
 
-      if issuer is not None and self.aki is not None and self.ski is not None and self.aki == self.ski:
-        print "# Self-signed"
-        issuer = None
+            if issuer is not None and self.aki is not None and self.ski is not None and self.aki == self.ski:
+                print "# Self-signed"
+                issuer = None
 
-      if issuer is not None and self.aki is not None and issuer.ski is not None and self.aki != issuer.ski:
-        print "# AKI does not match issuer SKI"
-        issuer = None
+            if issuer is not None and self.aki is not None and issuer.ski is not None and self.aki != issuer.ski:
+                print "# AKI does not match issuer SKI"
+                issuer = None
 
-      if issuer is not None:
-        print "%s -> %s;" % (issuer.node, self.node)
+            if issuer is not None:
+                print "%s -> %s;" % (issuer.node, self.node)
 
-    print
+        print
 
 certs = []
 
 for topdir in sys.argv[1:] or ["."]:
-  for dirpath, dirnames, filenames in os.walk(topdir):
-    certs += [x509(dirpath + "/" + filename) for filename in filenames if filename.endswith(".cer")]
+    for dirpath, dirnames, filenames in os.walk(topdir):
+        certs += [x509(dirpath + "/" + filename) for filename in filenames if filename.endswith(".cer")]
 
 for i, cert in enumerate(certs):
-  cert.set_node("cert_%d" % i)
+    cert.set_node("cert_%d" % i)
 
 print """\
 digraph certificates {
@@ -165,6 +165,6 @@ ratio = fill;
 """
 
 for cert in certs:
-  cert.dot()
+    cert.dot()
 
 print "}"