aboutsummaryrefslogtreecommitdiff
path: root/rpkid/testbed.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2008-04-18 23:39:55 +0000
committerRob Austein <sra@hactrn.net>2008-04-18 23:39:55 +0000
commita0be939602e58f77d99d09acfc12743b7ff5146b (patch)
treefa0433fa95dc0f4a460ab4e1eb887d7b13737ffa /rpkid/testbed.py
parente11002b6beffdbd9b847038693d666f01cc1bc9e (diff)
Clean up unnecessarily complicated trust anchor code
svn path=/rpkid/cronjob.py; revision=1677
Diffstat (limited to 'rpkid/testbed.py')
-rw-r--r--rpkid/testbed.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index 7de56bb0..3534b24f 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -578,7 +578,7 @@ class allocation(object):
cms = rpki.https.client(
client_key = testbed_key,
client_certs = testbed_certs,
- server_ta = rpki.x509.X509_chain(self.rpkid_ta),
+ server_ta = self.rpkid_ta,
url = url,
msg = cms)
elt = rpki.cms.xml_verify(der = cms, ta = self.rpkid_ta)
@@ -681,7 +681,7 @@ class allocation(object):
rpki.log.info("Running cron for %s" % self.name)
rpki.https.client(client_key = testbed_key,
client_certs = testbed_certs,
- server_ta = rpki.x509.X509_chain(self.rpkid_ta),
+ server_ta = self.rpkid_ta,
url = "https://localhost:%d/cronjob" % self.rpki_port,
msg = "Run cron now, please")