Finish prying RPKI conformance checks apart from object verification.

svn path=/branches/tk705/; revision=6214

1 files changed, 5 insertions, 1 deletions

diff --git a/rp/rcynic/rcynicng b/rp/rcynic/rcynicng
index 68b2781b..096ed467 100755
--- a/rp/rcynic/rcynicng
+++ b/rp/rcynic/rcynicng
@@ -316,8 +316,9 @@ class CRL(rpki.POW.CRL):
 
     def check(self, issuer):
         status = Status.update(self.uri, self.generation)
+        self.checkRPKIConformance(status = status, issuer = issuer)
         try:
-            self.verify(issuer, status)
+            self.verify(issuer)
         except rpki.POW.ValidationError as e:
             logger.debug("%r rejected: %s", self, e)
             status.add(codes.OBJECT_REJECTED)
@@ -378,6 +379,7 @@ class Ghostbuster(rpki.POW.CMS):
         except rpki.POW.ValidationError as e:
             logger.debug("%r rejected: %s", self, e)
             status.add(codes.OBJECT_REJECTED)
+        self.checkRPKIConformance(status)
         codes.normalize(status)
         return not any(s.kind == "bad" for s in status)
 
@@ -417,6 +419,7 @@ class Manifest(rpki.POW.Manifest):
         except rpki.POW.ValidationError as e:
             logger.debug("%r rejected: %s", self, e)
             status.add(codes.OBJECT_REJECTED)
+        self.checkRPKIConformance(status)
         self.thisUpdate = self.getThisUpdate()
         self.nextUpdate = self.getNextUpdate()
         self.number     = self.getManifestNumber()
@@ -473,6 +476,7 @@ class ROA(rpki.POW.ROA):
             vcard = self.verify()
         except rpki.POW.ValidationError:
             status.add(codes.OBJECT_REJECTED)
+        self.checkRPKIConformance(status)
         self.asn      = self.getASID()
         self.prefixes = self.getPrefixes()
         codes.normalize(status)