Changeset 187a8f9

Timestamp:

Feb 13, 2015 10:15:47 AM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

59c56fa

Parents:

c3a573c (diff), ad4b25a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/federation/util.py (modified) (2 diffs)

fedd/federation/util.py

@@ -307 +307 @@
 
 def abac_pem_type(cert):
-    key_re = re.compile('\s*-----BEGIN RSA PRIVATE KEY-----$')
+    key_re = re.compile('\s*-----BEGIN (RSA )?PRIVATE KEY-----$')
     cert_re = re.compile('\s*-----BEGIN CERTIFICATE-----$') 
     type = None
@@ -364 +364 @@
     # Initialize the diversions
     divs = [diversion(s, e, fn=pfn, fd=pfd ) for s, e, pfn, pfd in (
-        ('\s*-----BEGIN RSA PRIVATE KEY-----$', 
-            '\s*-----END RSA PRIVATE KEY-----$',
+        ('\s*-----BEGIN (RSA )?PRIVATE KEY-----$', 
+            '\s*-----END (RSA )?PRIVATE KEY-----$',
             keyfile, kf),
         ('\s*-----BEGIN CERTIFICATE-----$',