diff options
| author | Rob Austein <sra@hactrn.net> | 2009-06-01 05:07:46 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-06-01 05:07:46 +0000 |
| commit | cd006f969edd7e04f70b12f50b4a0cb844e022ae (patch) | |
| tree | 04bc33cab361d8a8d4f766fe691409edd3fdae81 /rpkid/testpoke.py | |
| parent | fd6c0d51c75ccb24b50a4247ac34ab24f62f8636 (diff) | |
New TLS code mostly working. Only lightly tested so far, but "make
test" ran to completion.
svn path=/pow/POW-0.7/POW.c; revision=2481
Diffstat (limited to 'rpkid/testpoke.py')
| -rw-r--r-- | rpkid/testpoke.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rpkid/testpoke.py b/rpkid/testpoke.py index 4e31122f..3657fbe7 100644 --- a/rpkid/testpoke.py +++ b/rpkid/testpoke.py @@ -102,16 +102,18 @@ def query_up_down(q_pdu): print r_xml try: r_msg.payload.check_response() - except rpki.async.ExitNow: + except (rpki.async.ExitNow, SystemExit): raise except Exception, edata: fail(edata) - rpki.async.exit_event_loop() + #rpki.async.exit_event_loop() + + rpki.https.want_persistent_client = False rpki.https.client( server_ta = [https_ta] + https_ca_certs, client_key = https_key, - client_cert = https_certs, + client_cert = https_cert, msg = q_cms, url = yaml_data["posturl"], callback = done, @@ -152,7 +154,6 @@ cms_ca_certs = get_PEM_chain("cms-ca-certs") https_ta = get_PEM("ssl-ca-cert", rpki.x509.X509) https_key = get_PEM("ssl-key", rpki.x509.RSA) https_cert = get_PEM("ssl-cert", rpki.x509.X509) -https_certs = get_PEM_chain("ssl-cert-chain", https_cert) https_ca_certs = get_PEM_chain("ssl-ca-certs") try: |