Changeset 6202 for TI12-security/trunk/python/MyProxyClient/myproxy/client.py

Timestamp:

21/12/09 16:40:20 (11 years ago)

Author:

pjkersha

Message:

Adding information about requested attributes for the decide page interface of the OpenID Provider.

File:

• TI12-security/trunk/python/MyProxyClient/myproxy/client.py (modified) (1 diff)

TI12-security/trunk/python/MyProxyClient/myproxy/client.py

@@ -1065 +1065 @@
                                                     (nCerts, len(pemCerts)))
     
-        # Return certs and private key
-        # - proxy cert
-        # - private key
-        # - rest of cert chain
-        if keys is not None:
-            pemKey = keys.as_pem(cipher=None)
+        if key is not None:
+            # Return certs and private key
+            # - proxy or dynamically issued certificate (MyProxy CA mode)
+            # - private key
+            # - rest of cert chain if proxy cert issued
+            pemKey = key.as_pem(cipher=None)
             creds = [pemCerts[0], pemKey]
             creds.extend(pemCerts[1:])
         else:
+            # Key generated externally - return certificate chain only
             creds = pemCerts
+
         
         return tuple(creds)