POW.pkix handles null characters better than POW does

svn path=/scripts/gski.py; revision=1072

1 files changed, 3 insertions, 3 deletions

diff --git a/scripts/rpki/x509.py b/scripts/rpki/x509.py
index a569e2a0..f1fb7cdc 100644
--- a/scripts/rpki/x509.py
+++ b/scripts/rpki/x509.py
@@ -23,7 +23,7 @@ class PEM_converter(object):
     self.e = "-----END %s-----"   % kind
 
   def looks_like_PEM(self, text):
-    return text.startswith(self.b)
+    return text.find(self.b) >= 0 and text.find(self.e) > 0
 
   def to_DER(self, pem):
     """Convert from PEM to DER."""
@@ -211,11 +211,11 @@ class X509(DER_object):
     
   def get_AKI(self):
     """Get the AKI extension from this certificate."""
-    return self._get_POW_extensions().get("authorityKeyIdentifier")
+    return (self.get_POWpkix().getExtension((2, 5, 29, 35)) or ((), 0, None))[2]
 
   def get_SKI(self):
     """Get the SKI extension from this certificate."""
-    return self._get_POW_extensions().get("subjectKeyIdentifier")
+    return (self.get_POWpkix().getExtension((2, 5, 29, 14)) or ((), 0, None))[2]
 
   def get_3779resources(self, as_intersector = None, v4_intersector = None, v6_intersector = None):
     """Get RFC 3779 resources as rpki.resource_set objects."""