Changeset 0a16b28 for fedd


Ignore:
Timestamp:
Aug 12, 2012 4:38:33 PM (12 years ago)
Author:
ABDULLA ALWABEL <abdullaalwabel@…>
Branches:
compt_changes
Children:
7bb03f0
Parents:
adf8517
Message:

Changes for compatiblity with openssl1.x.x

Location:
fedd
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • fedd/db_to_certs.py

    radf8517 r0a16b28  
    5454        ELSE CONCAT(g.pid, '/', g.gid)
    5555    END,
    56     CONCAT('-----BEGIN RSA PRIVATE KEY-----\\n',
     56    CONCAT('-----BEGIN PRIVATE KEY-----\\n',
    5757    s.privkey,
    58     '-----END RSA PRIVATE KEY-----\\n',
     58    '-----END PRIVATE KEY-----\\n',
    5959    '-----BEGIN CERTIFICATE-----\\n',
    6060        s.cert,

  • fedd/federation/util.py

    radf8517 r0a16b28  
    302302
    303303def abac_pem_type(cert):
    304     key_re = re.compile('\s*-----BEGIN RSA PRIVATE KEY-----$')
     304    key_re = re.compile('\s*-----BEGIN PRIVATE KEY-----$')
    305305    cert_re = re.compile('\s*-----BEGIN CERTIFICATE-----$')
    306306    type = None
    … …  
    359359    # Initialize the diversions
    360360    divs = [diversion(s, e, fn=pfn, fd=pfd ) for s, e, pfn, pfd in (
    361         ('\s*-----BEGIN RSA PRIVATE KEY-----$',
    362             '\s*-----END RSA PRIVATE KEY-----$',
     361        ('\s*-----BEGIN PRIVATE KEY-----$',
     362            '\s*-----END PRIVATE KEY-----$',
    363363            keyfile, kf),
    364364        ('\s*-----BEGIN CERTIFICATE-----$',
Note: See TracChangeset for help on using the changeset viewer.