Ignore:
Timestamp:
27/11/06 14:52:53 (14 years ago)
Author:
pjkersha
Message:

Replaced references to 'PubKey?' with 'Cert' as this is more accurate - they refer to X.509 certs which
contain public keys.

Location:
TI12-security/trunk/python/www/cgi-bin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/www/cgi-bin/idp.py

    r1636 r1771  
    2929 
    3030    smWSDLuri = "http://gabriel.bnsc.rl.ac.uk/sessionMgr.wsdl" 
    31     smPubKeyFilePath = "/usr/local/NDG/conf/certs/gabriel-sm-cert.pem" 
     31    smCertFilePath = "/usr/local/NDG/conf/certs/gabriel-sm-cert.pem" 
    3232 
    33     clntPubKeyFilePath = "../certs/GabrielCGI-cert.pem" 
     33    clntCertFilePath = "../certs/GabrielCGI-cert.pem" 
    3434    clntPriKeyFilePath = "../certs/GabrielCGI-key.pem" 
    3535 
    3636    IdPcgi(os.path.basename(__file__), 
    3737           smWSDLuri, 
    38            smPubKeyFilePath=smPubKeyFilePath, 
    39            clntPubKeyFilePath=clntPubKeyFilePath, 
     38           smCertFilePath=smCertFilePath, 
     39           clntCertFilePath=clntCertFilePath, 
    4040           clntPriKeyFilePath=clntPriKeyFilePath)() 
  • TI12-security/trunk/python/www/cgi-bin/security.py

    r1636 r1771  
    274274    aaWSDL = 'http://gabriel.bnsc.rl.ac.uk/attAuthority.wsdl' 
    275275 
    276     smPubKeyFilePath = "/usr/local/NDG/conf/certs/gabriel-sm-cert.pem" 
    277     aaPubKeyFilePath = "/usr/local/NDG/conf/certs/gabriel-aa-cert.pem" 
    278  
    279     clntPubKeyFilePath = "../certs/GabrielCGI-cert.pem" 
     276    smCertFilePath = "/usr/local/NDG/conf/certs/gabriel-sm-cert.pem" 
     277    aaCertFilePath = "/usr/local/NDG/conf/certs/gabriel-aa-cert.pem" 
     278 
     279    clntCertFilePath = "../certs/GabrielCGI-cert.pem" 
    280280    clntPriKeyFilePath = "../certs/GabrielCGI-key.pem" 
    281281 
     
    283283                                  aaWSDL, 
    284284                                                  scriptName=os.path.basename(__file__), 
    285                                   smPubKeyFilePath=smPubKeyFilePath, 
    286                                   aaPubKeyFilePath=aaPubKeyFilePath, 
    287                                   clntPubKeyFilePath=clntPubKeyFilePath, 
     285                                  smCertFilePath=smCertFilePath, 
     286                                  aaCertFilePath=aaCertFilePath, 
     287                                  clntCertFilePath=clntCertFilePath, 
    288288                                  clntPriKeyFilePath=clntPriKeyFilePath) 
    289289    securityCGI() 
  • TI12-security/trunk/python/www/cgi-bin/sp.py

    r1636 r1771  
    4444    returnURI = 'https://gabriel.bnsc.rl.ac.uk/cgi-bin/sp.py' 
    4545    aaWSDL = 'http://gabriel.bnsc.rl.ac.uk/attAuthority.wsdl' 
    46     aaPubKeyFilePath = "/usr/local/NDG/conf/certs/gabriel-aa-cert.pem" 
     46    aaCertFilePath = "/usr/local/NDG/conf/certs/gabriel-aa-cert.pem" 
    4747 
    48     clntPubKeyFilePath = "../certs/GabrielCGI-cert.pem" 
     48    clntCertFilePath = "../certs/GabrielCGI-cert.pem" 
    4949    clntPriKeyFilePath = "../certs/GabrielCGI-key.pem" 
    5050 
     
    5252          returnURI, 
    5353          aaWSDL, 
    54           aaPubKeyFilePath=aaPubKeyFilePath, 
    55           clntPubKeyFilePath=clntPubKeyFilePath, 
     54          aaCertFilePath=aaCertFilePath, 
     55          clntCertFilePath=clntCertFilePath, 
    5656          clntPriKeyFilePath=clntPriKeyFilePath)() 
    5757 
Note: See TracChangeset for help on using the changeset viewer.