diff options
Diffstat (limited to 'rpkid/tests/testpoke.py')
| -rw-r--r-- | rpkid/tests/testpoke.py | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/rpkid/tests/testpoke.py b/rpkid/tests/testpoke.py index 633f0251..0e9c06cd 100644 --- a/rpkid/tests/testpoke.py +++ b/rpkid/tests/testpoke.py @@ -12,7 +12,21 @@ Default configuration file is testpoke.yaml, override with --yaml option. $Id$ -Copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") +Copyright (C) 2010 Internet Systems Consortium ("ISC") + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -29,7 +43,7 @@ PERFORMANCE OF THIS SOFTWARE. import os, time, getopt, sys, yaml import rpki.resource_set, rpki.up_down, rpki.left_right, rpki.x509 -import rpki.https, rpki.config, rpki.exceptions +import rpki.http, rpki.config, rpki.exceptions import rpki.relaxng, rpki.oids, rpki.log, rpki.async os.environ["TZ"] = "UTC" @@ -108,12 +122,9 @@ def query_up_down(q_pdu): except Exception, e: fail(e) - rpki.https.want_persistent_client = False + rpki.http.want_persistent_client = False - rpki.https.client( - server_ta = [https_ta] + https_ca_certs, - client_key = https_key, - client_cert = https_cert, + rpki.http.client( msg = q_der, url = yaml_data["posturl"], callback = done, @@ -151,11 +162,6 @@ cms_crl = get_PEM("cms-crl", rpki.x509.CRL) cms_certs = get_PEM_chain("cms-cert-chain", cms_cert) 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_ca_certs = get_PEM_chain("ssl-ca-certs") - try: dispatch[yaml_req["type"]]() rpki.async.event_loop() |