diff options
| -rwxr-xr-x | rpkid/irbe-cli.py | 10 | ||||
| -rw-r--r-- | rpkid/rpki/https.py | 2 | ||||
| -rw-r--r-- | rpkid/testpoke.py | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/rpkid/irbe-cli.py b/rpkid/irbe-cli.py index eea87ff4..bb535ebb 100755 --- a/rpkid/irbe-cli.py +++ b/rpkid/irbe-cli.py @@ -176,10 +176,10 @@ if not argv: cfg = rpki.config.parser(cfg_file, "irbe-cli") -bpki_ta = rpki.x509.X509(Auto_file = cfg.get("bpki-ta")) -rpkid_cert = rpki.x509.X509(Auto_files = cfg.get("rpkid-cert")) -irbe_cert = rpki.x509.X509(Auto_files = cfg.get("irbe-cert")) -irbe_key = rpki.x509.RSA( Auto_file = cfg.get("irbe-key")) +bpki_ta = rpki.x509.X509(Auto_file = cfg.get("bpki-ta")) +rpkid_cert = rpki.x509.X509(Auto_file = cfg.get("rpkid-cert")) +irbe_cert = rpki.x509.X509(Auto_file = cfg.get("irbe-cert")) +irbe_key = rpki.x509.RSA( Auto_file = cfg.get("irbe-key")) https_url = cfg.get("https-url") q_msg = rpki.left_right.msg() @@ -200,7 +200,7 @@ der = rpki.https.client(client_key = irbe_key, url = https_url, msg = q_cms) -r_msg, r_xml = cms_msg.unwrap(der, r_cms, (bpki_ta, rpkid_cert), pretty_print = True) +r_msg, r_xml = cms_msg.unwrap(der, (bpki_ta, rpkid_cert), pretty_print = True) print r_xml diff --git a/rpkid/rpki/https.py b/rpkid/rpki/https.py index 3f411c22..17a8cc5d 100644 --- a/rpkid/rpki/https.py +++ b/rpkid/rpki/https.py @@ -31,7 +31,7 @@ import POW disable_tls_certificate_validation_exceptions = False # Chatter suppression -debug_tls_certs = False +debug_tls_certs = True rpki_content_type = "application/x-rpki" diff --git a/rpkid/testpoke.py b/rpkid/testpoke.py index 2648fcd0..2d26d12c 100644 --- a/rpkid/testpoke.py +++ b/rpkid/testpoke.py @@ -118,6 +118,10 @@ def do_revoke(): q_pdu.ski = yaml_req["ski"] query_up_down(q_pdu) +# Some day this should be conditional +rpki.log.init("testpoke") +rpki.log.set_trace(True) + dispatch = { "list" : do_list, "issue" : do_issue, "revoke" : do_revoke } cms_ta = get_PEM("cms-ca-cert", rpki.x509.X509) |