Changeset df35876

Timestamp:

Jul 8, 2012 10:54:05 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

4708875

Parents:

25bf6cc

Message:

Somehow recoding the pems got missed here...

File:

• fedd/federation/proof.py (modified) (3 diffs)

fedd/federation/proof.py

@@ -6 +6 @@
 import sys
 import os, os.path
+import re
 
 from string import join
@@ -162 +163 @@
 
         return pp.proof
+    @staticmethod
+    def pem_to_der(c):
+        pat = '-----BEGIN CERTIFICATE-----(.*)-----END CERTIFICATE'
+        m = re.match(pat, c, re.DOTALL)
+        if m: return b64decode(m.group(1))
+        else: return c
+
 
     @staticmethod
@@ -173 +181 @@
                 self = proof(d['prover'], d['principal'], d['attribute'], None)
                 for c in d.get('credential', []):
-                    if ac.load_id_chunk(c) != ABAC.ABAC_CERT_SUCCESS:
+                    c = self.pem_to_der(c)
+                    if ac.load_id_chunk(c)!= ABAC.ABAC_CERT_SUCCESS:
                         ac.load_attribute_chunk(c)
                 self.creds = ac.credentials()