Fix last (?) remaining direct reference to "POWpkix" outside of

rpki.x509 module.

svn path=/branches/tk274/; revision=4694

2 files changed, 7 insertions, 1 deletions

diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py
index 45b0d32d..f4638807 100644
--- a/rpkid/rpki/rootd.py
+++ b/rpkid/rpki/rootd.py
@@ -297,7 +297,7 @@ class main(object):
     if self.crl_number is None:
       try:
         crl = rpki.x509.CRL(DER_file = os.path.join(self.rpki_root_dir, self.rpki_root_crl))
-        self.crl_number = crl.get_POWpkix().getExtension(rpki.oids.name2oid["cRLNumber"])[2]
+        self.crl_number = crl.getCRLNumber()
       except:
         self.crl_number = 0
     self.crl_number += 1
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py
index 602c9a6e..2fbd25ed 100644
--- a/rpkid/rpki/x509.py
+++ b/rpkid/rpki/x509.py
@@ -1756,6 +1756,12 @@ class CRL(DER_object):
     """
     return X501DN.from_POW(self.get_POW().getIssuer())
 
+  def getCRLNumber(self):
+    """
+    Get CRL Number value for this CRL.
+    """
+    return self.get_POWpkix().getExtension(rpki.oids.name2oid["cRLNumber"])[2]
+
   @classmethod
   def generate(cls, keypair, issuer, serial, thisUpdate, nextUpdate, revokedCertificates, version = 1, digestType = "sha256WithRSAEncryption"):
     """