Ignore:
Timestamp:
11/12/09 15:23:40 (11 years ago)
Author:
pjkersha
Message:
Location:
TI12-security/trunk/python/MyProxyClient
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/MyProxyClient/myproxy/client.py

    r6098 r6107  
    10691069        # - private key 
    10701070        # - rest of cert chain 
    1071         pemKey = key.as_pem(cipher=None) 
    1072         creds = [pemCerts[0], pemKey] 
    1073         creds.extend(pemCerts[1:]) 
     1071        if keys is not None: 
     1072            pemKey = keys.as_pem(cipher=None) 
     1073            creds = [pemCerts[0], pemKey] 
     1074            creds.extend(pemCerts[1:]) 
     1075        else: 
     1076            creds = pemCerts 
    10741077         
    10751078        return tuple(creds) 
    1076          
    10771079 
    10781080    def getDelegation(self, *arg, **kw): 
  • TI12-security/trunk/python/MyProxyClient/test/myProxyClient.cfg

    r5048 r6107  
    1212# Delete this element and take setting from MYPROXY_SERVER environment  
    1313# variable if required 
    14 #hostname=localhost 
     14hostname=localhost 
    1515 
    1616# Delete this element to take default setting 7512 or read  
     
    4343proxyCertLifetime=64800 
    4444 
    45 caCertFilePath=$MYPROXYCLIENT_UNITTEST_DIR/ndg-test-ca.crt 
     45#caCertFilePath=$MYPROXYCLIENT_UNITTEST_DIR/ndg-test-ca.crt 
     46caCertFilePath=$MYPROXYCLIENT_UNITTEST_DIR/ndg-glue-ca.crt 
Note: See TracChangeset for help on using the changeset viewer.