git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nocomponent' into geni-v3
[sfa.git]
/
sfa
/
trust
/
gid.py
diff --git
a/sfa/trust/gid.py
b/sfa/trust/gid.py
index
b490060
..
7222b18
100644
(file)
--- a/
sfa/trust/gid.py
+++ b/
sfa/trust/gid.py
@@
-156,15
+156,15
@@
class GID(Certificate):
else:
urn = hrn_to_urn(self.hrn, None)
else:
urn = hrn_to_urn(self.hrn, None)
- str = "URI:" + urn
+ str
ing
= "URI:" + urn
if self.uuid:
if self.uuid:
- str += ", " + "URI:" + uuid.UUID(int=self.uuid).urn
+ str
ing
+= ", " + "URI:" + uuid.UUID(int=self.uuid).urn
if self.email:
if self.email:
- str += ", " + "email:" + self.email
+ str
ing
+= ", " + "email:" + self.email
- self.set_data(str, 'subjectAltName')
+ self.set_data(str
ing
, 'subjectAltName')
##
# Decode the subject-alt-name field of the X509 certificate into the
##
# Decode the subject-alt-name field of the X509 certificate into the
@@
-232,6
+232,7
@@
class GID(Certificate):
# planetlab.us.arizona cannot sign a GID for planetlab.us.princeton.foo.
def verify_chain(self, trusted_certs=None):
# planetlab.us.arizona cannot sign a GID for planetlab.us.princeton.foo.
def verify_chain(self, trusted_certs=None):
+ logger.debug("GID.verify_chain with {} trusted certs".format(len(trusted_certs)))
# do the normal certificate verification stuff
trusted_root = Certificate.verify_chain(self, trusted_certs)
# do the normal certificate verification stuff
trusted_root = Certificate.verify_chain(self, trusted_certs)