Clean up lame debugging code

svn path=/scripts/biz-certs/Bob-CA.srl; revision=1349

3 files changed, 2 insertions, 18 deletions

diff --git a/scripts/biz-certs/Bob-CA.srl b/scripts/biz-certs/Bob-CA.srl
index dbbaafe4..913bddb7 100644
--- a/scripts/biz-certs/Bob-CA.srl
+++ b/scripts/biz-certs/Bob-CA.srl
@@ -1 +1 @@
-90801F1ED19454FA
+90801F1ED19454FD
diff --git a/scripts/rpki/cms.py b/scripts/rpki/cms.py
index d5b2ca87..568322c9 100644
--- a/scripts/rpki/cms.py
+++ b/scripts/rpki/cms.py
@@ -21,8 +21,6 @@ def sign(plaintext, keypair, certs):
   OpenSSL CLI tool will accept them.  rpki.x509 handles that for us.
   """
 
-  print "Entering cms.sign()"
-
   certs.chainsort()
 
   signer_filename = "cms.tmp.signer.pem"
@@ -54,8 +52,6 @@ def sign(plaintext, keypair, certs):
   os.unlink(certfile_filename)
   os.unlink(plaintext_filename)
 
-  print "Exiting cms.sign()"
-
   return cms
 
 # openssl smime -verify -inform DER -in THING.der -CAfile biz-certs/Alice-Root.cer
@@ -67,8 +63,6 @@ def verify(cms, ta):
   anything other than successful verification, we raise an exception.
   """  
 
-  print "Entering cms.verify()"
-
   ta_filename = "cms.tmp.ta.pem"
 
   f = open(ta_filename, "w")
@@ -86,7 +80,6 @@ def verify(cms, ta):
   os.unlink(ta_filename)
 
   if status == "Verification successful\n":
-    print "Exit cms.verify()"
     return plaintext
   else:
     if debug:
@@ -102,17 +95,13 @@ def verify(cms, ta):
 
 def xml_verify(cms, ta):
   """Composite routine to verify CMS-wrapped XML."""
-  print "Entering cms.xml_verify()"
   val = lxml.etree.fromstring(verify(cms, ta))
-  print "Exiting cms.xml_verify()"
   return val
 
 def xml_sign(elt, key, certs, encoding = "us-ascii"):
   """Composite routine to sign CMS-wrapped XML."""
-  print "Entering cms.xml_sign()"
   val = sign(lxml.etree.tostring(elt, pretty_print = True, encoding = encoding, xml_declaration = True),
              key, certs)
-  print "Exiting cms.xml_sign()"
   return val
 
 def dumpasn1(thing):
diff --git a/scripts/rpkid.py b/scripts/rpkid.py
index 4020395b..feed9add 100755
--- a/scripts/rpkid.py
+++ b/scripts/rpkid.py
@@ -15,7 +15,6 @@ import rpki.https, rpki.config, rpki.cms, rpki.exceptions, rpki.relaxng
 def left_right_handler(query, path):
   """Process one left-right PDU."""
   try:
-    print "Entering left_right_handler()"
     q_elt = rpki.cms.xml_verify(query, gctx.cms_ta_irbe)
     rpki.relaxng.left_right.assertValid(q_elt)
     q_msg = rpki.left_right.sax_handler.saxify(q_elt)
@@ -23,7 +22,6 @@ def left_right_handler(query, path):
     r_elt = r_msg.toXML()
     rpki.relaxng.left_right.assertValid(r_elt)
     reply = rpki.cms.xml_sign(r_elt, gctx.cms_key, gctx.cms_certs)
-    print "Exiting left_right_handler()"
     return 200, reply
   except Exception, data:
     traceback.print_exc()
@@ -32,7 +30,6 @@ def left_right_handler(query, path):
 def up_down_handler(query, path):
   """Process one up-down PDU."""
   try:
-    print "Entering up_down_handler()"
     child_id = path.partition("/up-down/")[2]
     if not child_id.isdigit():
       raise rpki.exceptions.BadContactURL, "Bad path: %s" % path
@@ -40,7 +37,6 @@ def up_down_handler(query, path):
     if child is None:
       raise rpki.exceptions.ChildNotFound, "Could not find child %s" % child_id
     reply = child.serve_up_down(gctx, query)
-    print "Exiting up_down_handler()"
     return 200, reply
   except Exception, data:
     traceback.print_exc()
@@ -50,12 +46,11 @@ def cronjob_handler(query, path):
   """Periodic tasks.  As simple as possible for now, may need to break
   this up into separate handlers later.
   """
-  print "Entering cronjob_handler()"
+
   for s in rpki.left_right.self_elt.sql_fetch_all(gctx):
     s.client_poll(gctx)
     s.update_children(gctx)
     s.regenerate_crls_and_manifests(gctx)
-  print "Exiting cronjob_handler()"
   return 200, "OK"
 
 class global_context(object):