aboutsummaryrefslogtreecommitdiff
path: root/rpkid/rpki/rpkid.py
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2013-03-21 01:35:49 +0000
committerRob Austein <sra@hactrn.net>2013-03-21 01:35:49 +0000
commitab90c10df0598aca095ae56ad886ce5a8bc008cd (patch)
treece5bc2433ea76337ec752be1b6c95d8628f55ed7 /rpkid/rpki/rpkid.py
parent7bead4dba761aa6dd3639ab9bda8d5ea31d7d302 (diff)
Record context in CMS replay exceptions. Closes #458.
svn path=/trunk/; revision=5188
Diffstat (limited to 'rpkid/rpki/rpkid.py')
-rw-r--r--rpkid/rpki/rpkid.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py
index 0a3e9675..ce815345 100644
--- a/rpkid/rpki/rpkid.py
+++ b/rpkid/rpki/rpkid.py
@@ -198,7 +198,7 @@ class main(object):
def unwrap(r_der):
r_cms = rpki.left_right.cms_msg(DER = r_der)
r_msg = r_cms.unwrap((self.bpki_ta, self.irdb_cert))
- self.irdbd_cms_timestamp = r_cms.check_replay(self.irdbd_cms_timestamp)
+ self.irdbd_cms_timestamp = r_cms.check_replay(self.irdbd_cms_timestamp, self.irdb_url)
if not r_msg.is_reply() or not all(type(r_pdu) in q_types for r_pdu in r_msg):
raise rpki.exceptions.BadIRDBReply(
"Unexpected response to IRDB query: %s" % r_cms.pretty_print_content())
@@ -280,7 +280,7 @@ class main(object):
try:
q_cms = rpki.left_right.cms_msg(DER = query)
q_msg = q_cms.unwrap((self.bpki_ta, self.irbe_cert))
- self.irbe_cms_timestamp = q_cms.check_replay(self.irbe_cms_timestamp)
+ self.irbe_cms_timestamp = q_cms.check_replay(self.irbe_cms_timestamp, path)
if not q_msg.is_query():
raise rpki.exceptions.BadQuery, "Message type is not query"
q_msg.serve_top_level(self, done)