diff options
| author | Rob Austein <sra@hactrn.net> | 2007-12-02 19:41:40 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-12-02 19:41:40 +0000 |
| commit | 9221b12d1b1a9063f61d0066c65c0fb8654b32b0 (patch) | |
| tree | 858828c5003bd6212447ffc5ffd79c061253c75e | |
| parent | 49a3513e2a70a51e4e9bd2937087d48c915b0649 (diff) | |
Checkpoint of silly debugging code
svn path=/scripts/biz-certs/Bob-CA.srl; revision=1346
| -rw-r--r-- | scripts/biz-certs/Bob-CA.srl | 2 | ||||
| -rw-r--r-- | scripts/rpki/cms.py | 19 |
2 files changed, 17 insertions, 4 deletions
diff --git a/scripts/biz-certs/Bob-CA.srl b/scripts/biz-certs/Bob-CA.srl index 149015d8..dbbaafe4 100644 --- a/scripts/biz-certs/Bob-CA.srl +++ b/scripts/biz-certs/Bob-CA.srl @@ -1 +1 @@ -90801F1ED19454F8 +90801F1ED19454FA diff --git a/scripts/rpki/cms.py b/scripts/rpki/cms.py index 71370f91..d5b2ca87 100644 --- a/scripts/rpki/cms.py +++ b/scripts/rpki/cms.py @@ -21,6 +21,8 @@ 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" @@ -52,6 +54,8 @@ 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 @@ -63,6 +67,8 @@ 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") @@ -80,6 +86,7 @@ def verify(cms, ta): os.unlink(ta_filename) if status == "Verification successful\n": + print "Exit cms.verify()" return plaintext else: if debug: @@ -95,12 +102,18 @@ def verify(cms, ta): def xml_verify(cms, ta): """Composite routine to verify CMS-wrapped XML.""" - return lxml.etree.fromstring(verify(cms, ta)) + 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.""" - return sign(lxml.etree.tostring(elt, pretty_print = True, encoding = encoding, xml_declaration = True), - key, certs) + 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): """Prettyprint an ASN.1 DER object using cryptlib dumpasn1 tool. |