Changeset ad4b25a for fedd/federation

Timestamp:

Feb 9, 2015 9:15:55 AM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

187a8f9

Parents:

36e701e

Message:

SSH changed KEY formats again (from Ryan)

File:

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

fedd/federation/util.py

@@ -293 +293 @@
 
 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
@@ -350 +350 @@
     # 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-----$',