Changeset ad4b25a for fedd


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • fedd/federation/util.py

    r36e701e rad4b25a  
    293293
    294294def abac_pem_type(cert):
    295     key_re = re.compile('\s*-----BEGIN RSA PRIVATE KEY-----$')
     295    key_re = re.compile('\s*-----BEGIN (RSA )?PRIVATE KEY-----$')
    296296    cert_re = re.compile('\s*-----BEGIN CERTIFICATE-----$')
    297297    type = None
    … …  
    350350    # Initialize the diversions
    351351    divs = [diversion(s, e, fn=pfn, fd=pfd ) for s, e, pfn, pfd in (
    352         ('\s*-----BEGIN RSA PRIVATE KEY-----$',
    353             '\s*-----END RSA PRIVATE KEY-----$',
     352        ('\s*-----BEGIN (RSA )?PRIVATE KEY-----$',
     353            '\s*-----END (RSA )?PRIVATE KEY-----$',
    354354            keyfile, kf),
    355355        ('\s*-----BEGIN CERTIFICATE-----$',
Note: See TracChangeset for help on using the changeset viewer.