diff options
| author | Rob Austein <sra@hactrn.net> | 2007-12-05 23:31:51 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-12-05 23:31:51 +0000 |
| commit | b1e8d92948f55489fe26326a4e4136c7dc7ccb96 (patch) | |
| tree | d0d9378d53616a0c0d8896646f7fc61822ed8d52 | |
| parent | ce469b65294321b9cef0c1734d946b5a1a537f07 (diff) | |
Clear control options when generating replies.
Slightly better verbose CMS logging
svn path=/scripts/biz-certs/Bob-CA.srl; revision=1365
| -rw-r--r-- | scripts/biz-certs/Bob-CA.srl | 2 | ||||
| -rw-r--r-- | scripts/rpki/cms.py | 7 | ||||
| -rw-r--r-- | scripts/rpki/left_right.py | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/scripts/biz-certs/Bob-CA.srl b/scripts/biz-certs/Bob-CA.srl index 1888c757..35d9ce2a 100644 --- a/scripts/biz-certs/Bob-CA.srl +++ b/scripts/biz-certs/Bob-CA.srl @@ -1 +1 @@ -90801F1ED1945510 +90801F1ED1945518 diff --git a/scripts/rpki/cms.py b/scripts/rpki/cms.py index 8e14047d..2601f42b 100644 --- a/scripts/rpki/cms.py +++ b/scripts/rpki/cms.py @@ -54,7 +54,7 @@ def sign(plaintext, keypair, certs): if debug >= 2: print - print "CMS dump:" + print "Signed CMS:" dumpasn1(cms) return cms @@ -68,6 +68,11 @@ def verify(cms, ta): anything other than successful verification, we raise an exception. """ + if debug >= 2: + print + print "Verifying CMS:" + dumpasn1(cms) + ta_filename = "cms.tmp.ta.pem" f = open(ta_filename, "w") diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index e1ab3e2a..eeead168 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -75,6 +75,9 @@ class data_elt(base_elt, rpki.sql.sql_persistant): r_pdu = self.__class__() r_pdu.self_id = self.self_id setattr(r_pdu, self.sql_template.index, getattr(self, self.sql_template.index)) + else: + for b in r_pdu.booleans: + setattr(r_pdu, b, False) r_pdu.action = self.action r_pdu.type = "reply" return r_pdu |